Better error notifications, and faster load