Updated error handling again