[BISERVER-8405, BISERVER-8420] fixed null pointer issues
Merge pull request #9 from wgorman/master

[BISERVER-8405, BISERVER-8420] fixed null pointer issues