CONN-676: Null Dereferences identified by Fortify scan addressed by a series of null checks (through short-circuit logic) or moving code to a scope where it cannot be null.
Merge pull request #618 from christophermay07/CONN-676

CONN-676: Addressed Null Dereferences identified by Fortify scan