Fixed  'is None' problem and save payment anyway