Revert "bug fixes"
Merge pull request #336 from EventStore/revert-335-nothandledbug

Revert "bug fixes"