Inspired by Reverend Homer

removed several "null check after use" issues
1 file changed