Executor error handling is reborn

[#81035386]

Signed-off-by: Eric Malm <emalm@pivotal.io>