fix: Problems with a series of null pointer checks

fix: Problems with a series of null pointer checks #394