FIX NullPointerException #47