Work towards next version

Escaping hash, error message fix, null point fix (hopefully).