Let's try a defined-or to get rid of undef errors...