- added TypeError when the eventMap is not an object
Merge remote-tracking branch 'origin/master'