Some more null checks
#ngp-22 Fixed
#ngp-23 Fixed