Fix bugs and make some errors not worthy of a die