Added check to make sure Organisation details are set