Fixed null setting of classname