FIX:  Crash on Malformed Hashes
Merge branch 'fix-invalidhashes' into devel