using getOrCreateSubMap method to avoid nullpointer error
Merge pull request #232 from jovanchohan/hawkeyebugfixes

using getOrCreateSubMap method to avoid nullpointer error