Bug fix: check not-null
+review CR-IC-3798