Do not try to dereference a not initialized variable
Merge pull request #895 from sjinks/patch-1

Do not try to dereference a not initialized variable