Fix suppressed error issue with handler
Merge remote-tracking branch 'upstream/master'
Merge pull request #291 from jerv13/master

Fix suppressed error issue with handler