Better handling of load state changes, better error handling