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

Resolve "NULL Pointer Dereference FIX"

Closes #45

See merge request !30