Should add these to the hash map to prevent a NPE

Fixes #2333