Fix bug on search value. Should return null not throw an exception.