CPL error handling now implemented where it belongs.