Make sure to remove listener, even after fail