Readded double check and ensured payment total is not there, instead of 0. #990