Fixed first NullPointerException