A bit of try-catch thingies added