fix possible NPE for ENTESB-903 and ENTESB-932