Fixed NullPointerException :)