remove some unnecessary null pointer checks

-closes #1997