Improve error message for issues