Improved error checking during company update/creation.