Standardize death checks