Added more-robust-processing logic