Merge pull request #2535 from akallabeth/null_dereference_fix
authorBernhard Miklautz <bmiklautz@users.noreply.github.com>
Mon, 13 Apr 2015 09:52:03 +0000 (11:52 +0200)
committerBernhard Miklautz <bmiklautz@users.noreply.github.com>
Mon, 13 Apr 2015 09:52:03 +0000 (11:52 +0200)
Fixed NULL dereference.


Trivial merge