add yaml exception catchers plus small fixes