Added constants for OEM_*, PSM_*
Clarified error message