Call the completion handler with an exception like before

Also test that the handler is actually called