The pull request with all the code.

can these two be null? if not, you should add protection.