Fix potential NPE #5511