Adding better error stuff