Stop decorators swallowing returns from tasks

Change-Id: I7e557c30a6e63cb5c7cc84d833fe06cd6dc6f159
Merge "Stop decorators swallowing returns from tasks"