[PATCH 4/6] Don't run storage execution in an endless loop.