Add null pointer check
Merge remote-tracking branch 'origin/development' into development