[stable30] Ensure that the hash method does not return null

[stable30] Ensure that the hash method does not return null #931