More metadata additions, and better error reporting (again).