Update error handling for msr-safe-based architectures

[rountree]

Update msr subsystem to account for the updated/disambiguated error message in msr-safe.

This should include accounting for msr-safe versioning.