Added guard for classes that don’t support units