Better error handling.
Better error handling