(#1578) don't return from utils.cleanup prematurely

This might prevent some of the impact of test failures.