Fixed reference to class/type that might be undefined