Fix segfault when cleaning without execution context
Fix failing quit when quitting during execution