Added better error handling on loading.