Quick and dirty bugfix in commandhandler. Didnt reset container on
exceptions inside switch.