Simplifed exception handling