Added save-guard to prevent further errors
Added direct executors, thanks to Barak Bar Orion.