Initial work adding error handler metadata