Bug #3 - have an empty handler if there is no handler for consistency

Closes #3