This PR makes the errors we spit out a bit more clear about what block is problematic.
Attach a file by drag & drop or click to upload
