Fix potential NPE #5513