Make error handling slightly less non-existent