adapt error messages to core change