Preventing crash on NullPointerException, #219