Fixed NullPointer!