Die On Error

TE-567
nit-pick: i suggest adding a new line