Changed the way we die on errors