Null reference fix.
fixed empty string search