Updates to show for more appropriate error messages on failed searches