initial fix on error messages