Bugfix on cancelation if exception occurs