fix error handlers
v1.2.1