Merge pull request #4512 from chipitsine/master
authorakallabeth <akallabeth@users.noreply.github.com>
Mon, 26 Mar 2018 11:09:11 +0000 (13:09 +0200)
committerGitHub <noreply@github.com>
Mon, 26 Mar 2018 11:09:11 +0000 (13:09 +0200)
resolve several possible null pointer dereference


Trivial merge