Recursive rendering detected when altering fields on entity types

This is a really good solution.

Should we log the exception, maybe as a warning, so that developers can debug errors/issues with devel generate?

Now I see the finally statement is to ensure the cleanup code is executed. It is probably okay to commit as-is and deal with exceptions later.