Ensuring imaging worker cleans up on failure

Fixes EUCA-9390