Quick change to fix a possible NullPointer