Fix exeptions