BugFix for Exception command