Making command more robust.