fixup, add error handlers for now