Improved error handling on load