Adding some 'or die' and what-not.