Fixing cms exceptions