Error when `exec` used
Cleanup
Add missing listed check