Moved event call to after loading has finished
Changed error handling of missing data