Adding NPE fixes - AIRAVATA-1028
fixing build error
checking NPEs
fixing build error
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/airavata