Implements command exceptions
Merge without conflicts