The decorator was swallowing errors, so I'm removing it temporarily