* Changed error catching in commands.