KFSUPGRADE-942 fix to catch npe