NullPointerException

Fixed