Error and label messages update

Improvements for consistency, as well as change in public API to display error messages correctly.