Improved error reporting and updated reload