Fixed several regressions
Moving towards exceptions