Error handling in local CRE improved.