Fix minor bugs in mode/type test functions

source/private/DeviceMode.m

@@ -10,15 +10,13 @@ function mode = DeviceMode(type, modeNo)
         % Motors are a special case where the mode name does not equal the type name
         if type == DeviceType.LargeMotor || type == DeviceType.MediumMotor
             mode = DeviceMode.Motor(modeNo);
+        elseif type == DeviceType.Unknown || type == DeviceType.None || type == DeviceType.Error
+            mode = DeviceMode.Default.Undefined;
         else
             mode = DeviceMode.(char(type))(modeNo);
         end
     catch ME
-        if strcmp(ME.identifier,'MATLAB:undefinedVarOrClass')
-            mode = DeviceMode.Default.Undefined; % Need to think about this...
-        else
-            error('ModeNo ''%d'' not valid for given type.', modeNo);
-        end
+        error('ModeNo ''%d'' not valid for given type.', modeNo);
     end
 end
 

source/private/isModeValid.m

 function isValid = isModeValid(mode, type)
 % Returns whether given mode is a valid mode in given type.
     if strcmp(class(mode), 'DeviceMode.Default')
+        isValid = true;
         return;
     end