removing superfluous nullptr checks.

closes #404