"[Kitaka, ctford] Reverted on trying to rethrow exception."

This reverts commit e76c5bed7b32bb17660721f2dc6e259c263160ae.