Fix potential (but never encountered) NPE