Add some more error handling in case we don't get any results.