Fix for issue #82 - "Problem with error labeling"