Improved error handling possibilities