fixed alias added aditional exceptions