Fixed NullPointerException in reloading