Further resolve CID 1222223
Resolve CID 1132030
Merge pull request #393 from Dmitry-Me/furtherResolve1222223

Further resolve CID 1222223
Merge pull request #394 from Dmitry-Me/resolve1132030

Resolve CID 1132030
Some safe coding. Check that pointer is not null.
Merge branch 'master' into travis_gcc_testsuite