Merge "Do now throw exception when activation code is empty"