ARGUS-79:Checks for null to avoid NPE

Signed-off-by: sneethiraj <sneethir@apache.org>