changed error-messages to be core-compatible