Merge "Improve error reporting when workspace not registered"