diff --git a/source/DeviceMode.m b/source/DeviceMode.m
index f131a060edec8a0c7ff551a236a5022f2e6b2a58..146666fcae37a1cfad442d497edc0bbca9a104f9 100644
--- a/source/DeviceMode.m
+++ b/source/DeviceMode.m
@@ -35,7 +35,7 @@ function mode = DeviceMode(type, modeNo)
             case DeviceType.InfraRed
                 mode = DeviceMode.InfraRed(modeNo);
             otherwise
-                mode = DeviceMode.Error(0); % Need to think about this...
+                mode = DeviceMode.Default.Undefined; % Need to think about this...
         end
     catch 
         error('MATLAB:RWTHMindstormsEV3:noclass:DeviceMode:invalidInputValue',...
diff --git a/source/isModeValid.m b/source/isModeValid.m
index ac5b575d41b3228831e889ee08b880c52b471280..debc72a9bd4a9687e418b51490f00f387e743b6e 100644
--- a/source/isModeValid.m
+++ b/source/isModeValid.m
@@ -2,7 +2,7 @@ function isValid = isModeValid(mode, type)
 % Returns whether given mode is a valid mode in given type.
     isValid = true;
     
-    if strcmp(class(mode), 'DeviceMode.Error')
+    if strcmp(class(mode), 'DeviceMode.Default')
         return;
     end