Fixed throwing from command line