Fix for an NPE when the Feature fields aren't set.