removed NullPointerException