GPII-177: Fixed the exec handler.. needs cleanup