#5906 Fix potential NPE