Added command manager exception handling