SEarch now checks for null :)