Fix NullPointerException #13