Handle the no class case too