Add crude exception management