Added Handler exceptions
Merge pull request #68 from klindenbach/50-ESHandler

Added Handler exceptions, looks good