Updated PC/SC error messages to include text return value as well as numeric value

Minor reorganization