Added undef excepotions