Re:# 1703 - null pointer fix