Fix for comment display and error message