@marcusklaas
Add additional checks for request cancelation
8e2eb8d