Better error handing for oath