Fix potential NPE