Fixed NullPointerException

+ lightweight