Check for undefined here too