Better error reporting (fix).