Update org created based on return type from new client
Clean up response codes, validation error