Commands exceptions fix