Improve error messages from pwd