[FIX] Possible NullPointerException