Addition to commit 7f899cf080044 to handle hash issues better instead of
creating possible memory corruption when a hash isn't found.