Please apply attached patch, I moved the affected inside the previous
Null-pointer check guarded area.
Created attachment 10960 [details] [review]
Moved that in guarded block...
Fixed in git.