Merge branch 'OCF45-null-pointer-dereference-fix' into 'staging'

Resolve "NULL Pointer Dereference FIX"

Closes #45

See merge request !30
6 jobs for OCF49-change-netapp-to-network-app
in 1 minute and 46 seconds, using 0 compute credits, and was queued for 2 seconds