Change null check, branch g

going to try rebase, merge --no-ff again, this time using the language in github commit messages generated by automatically merging PR:

```
Merge pull request XX from lukeasrodgers/BRANCH
```