Added exceptions when nasty things happen