Replace CommandException with Exception
Merge pull request #7524 from aresch/patch-2

Replace CommandException with Exception