Slight better error handling for failed search
Merged