Be more careful on non-initialized hashes