Command Option and fixes on exceptions