Fixed issue with dangling data-items after aborting a job

Signed-off-by: Daniel Dahlkvist (home) <messer_@hotmail.com>