Revert "Changed methods to better handle when no result is found."

This reverts commit 6dbf6438249c3f0e97657c4e6c46d1e9e6003495.