Fix a NullPointerException ?! :D #28