BUGFIX more precise checking for non existent classes