Adding check for null before search.  This all needs to be changed and
handled by validation/properties