Improved error handling, improved Event.h