Fixed Bad Error-Handler
Merge
Release