Small changes in error handlers and inline documentation