Fix error causing misinformation when exception in activities are thrown