Error types in the message map were causing issues and not really helping much, so switched back to string types.