Improve error message (part of Trac #1606)