Added some guard clauses for gatherers pushing incomplete data