FIX: Invalid Exception throw results in CI failures