Core compatible

Making errors compatible with core.