Improved error handling

One 'mo 'gain