Changed cyclic dependency error message

Also change raise code to be inline with current
convention.