Added exceptions for several commands