SOS-1411 Fix NPE