Simplify null pointer handling
Merge pull request #423 from Dmitry-Me/deconvoluteTernaryPlusCall

Simplify null pointer handling