Be more defensive to avoid the deploy halting