Added null checks for conditional loads that use 'contains'.
Merge pull request #29 from pjackson28/master

Added null checks for conditional loads that use 'contains'