Fixed:
 - registration shortName None Type error
 - organization address saving without city or state