[#110] Fixing a NullPointerException