Revert "Handle exception straight away"

This reverts commit 0cac4b793b3eb7c122f1f6550f2e62ba29e02795.