added some exceptions getting pased around