Updated error handling with stripe, refeactorings