Null checking
Embarressing swap of event dispatchers.  Fixes #16.