Merge branch 'master' into hotfix/issue_76

94 files changed, 310 insertions, 449 deletions

diff --git a/README.md b/README.md
index 55f898cfc..2f500b5ab 100644
--- a/README.md
+++ b/README.md
@@ -14,6 +14,8 @@ SmartDeviceLink (SDL) is a standard set of protocols and messages that connect a
   * The optional [SDL Server](https://github.com/smartdevicelink/sdl_server) can be used by Vehicle OEMs to update application policies and gather usage information for connected applications.
   * The [iOS](https://github.com/smartdevicelink/sdl_ios) and [Android](https://github.com/smartdevicelink/sdl_android) libraries are implemented by app developers into their applications to enable command and control via the connected head unit.
 
+<a href="http://www.youtube.com/watch?feature=player_embedded&v=AzdQdSCS24M" target="_blank"><img src="http://i.imgur.com/nm8UujD.png?1" alt="SmartDeviceLink" border="10" /></a>
+
 
 ## Mobile Proxy
 
diff --git a/SmartDeviceLink-iOS/Cartfile.private b/SmartDeviceLink-iOS/Cartfile.private
index ca859a624..47b42c3cd 100644
--- a/SmartDeviceLink-iOS/Cartfile.private
+++ b/SmartDeviceLink-iOS/Cartfile.private
@@ -1,3 +1,3 @@
-github "Quick/Quick" ~> 0.6
-github "Quick/Nimble" "e239824d84105de9e13b815006bc36e938cdd030"
-github "AliSoftware/OHHTTPStubs" ~> 4.2.0
+github "Quick/Quick" ~> 0.9
+github "Quick/Nimble" ~> 3.1
+github "AliSoftware/OHHTTPStubs" ~> 4.7
diff --git a/SmartDeviceLink-iOS/Cartfile.resolved b/SmartDeviceLink-iOS/Cartfile.resolved
index f6dce608d..86ec8ac79 100644
--- a/SmartDeviceLink-iOS/Cartfile.resolved
+++ b/SmartDeviceLink-iOS/Cartfile.resolved
@@ -1,3 +1,3 @@
-github "Quick/Nimble" "e239824d84105de9e13b815006bc36e938cdd030"
-github "AliSoftware/OHHTTPStubs" "4.2.0"
-github "Quick/Quick" "v0.6.0"
+github "Quick/Nimble" "v3.1.0"
+github "AliSoftware/OHHTTPStubs" "4.7.0"
+github "Quick/Quick" "v0.9.0"
diff --git a/SmartDeviceLink-iOS/Carthage/Build/iOS/Nimble.framework/Headers/DSL.h b/SmartDeviceLink-iOS/Carthage/Build/iOS/Nimble.framework/Headers/DSL.h
index 551af8856..e4a439063 100644
--- a/SmartDeviceLink-iOS/Carthage/Build/iOS/Nimble.framework/Headers/DSL.h
+++ b/SmartDeviceLink-iOS/Carthage/Build/iOS/Nimble.framework/Headers/DSL.h
@@ -21,6 +21,10 @@ NIMBLE_EXPORT id<NMBMatcher> NMB_equal(id expectedValue);
 NIMBLE_SHORT(id<NMBMatcher> equal(id expectedValue),
              NMB_equal(expectedValue));
 
+NIMBLE_EXPORT id<NMBMatcher> NMB_haveCount(id expectedValue);
+NIMBLE_SHORT(id<NMBMatcher> haveCount(id expectedValue),
+             NMB_haveCount(expectedValue));
+
 NIMBLE_EXPORT NMBObjCBeCloseToMatcher *NMB_beCloseTo(NSNumber *expectedValue);
 NIMBLE_SHORT(NMBObjCBeCloseToMatcher *beCloseTo(id expectedValue),
              NMB_beCloseTo(expectedValue));
@@ -103,12 +107,20 @@ NIMBLE_EXPORT id<NMBMatcher> NMB_allPass(id matcher);
 NIMBLE_SHORT(id<NMBMatcher> allPass(id matcher),
              NMB_allPass(matcher));
 
+NIMBLE_EXPORT id<NMBMatcher> NMB_satisfyAnyOfWithMatchers(id matchers);
+#define NMB_satisfyAnyOf(...) NMB_satisfyAnyOfWithMatchers(@[__VA_ARGS__])
+#ifndef NIMBLE_DISABLE_SHORT_SYNTAX
+#define satisfyAnyOf(...) NMB_satisfyAnyOf(__VA_ARGS__)
+#endif
+
 // In order to preserve breakpoint behavior despite using macros to fill in __FILE__ and __LINE__,
 // define a builder that populates __FILE__ and __LINE__, and returns a block that takes timeout
 // and action arguments. See https://github.com/Quick/Quick/pull/185 for details.
 typedef void (^NMBWaitUntilTimeoutBlock)(NSTimeInterval timeout, void (^action)(void (^)(void)));
 typedef void (^NMBWaitUntilBlock)(void (^action)(void (^)(void)));
 
+NIMBLE_EXPORT void NMB_failWithMessage(NSString *msg, NSString *file, NSUInteger line);
+
 NIMBLE_EXPORT NMBWaitUntilTimeoutBlock NMB_waitUntilTimeoutBuilder(NSString *file, NSUInteger line);
 NIMBLE_EXPORT NMBWaitUntilBlock NMB_waitUntilBuilder(NSString *file, NSUInteger line);
 
diff --git a/SmartDeviceLink-iOS/Carthage/Build/iOS/Nimble.framework/Headers/NMBExceptionCapture.h b/SmartDeviceLink-iOS/Carthage/Build/iOS/Nimble.framework/Headers/NMBExceptionCapture.h
index 8be4a5a69..7e5fb07c3 100644
--- a/SmartDeviceLink-iOS/Carthage/Build/iOS/Nimble.framework/Headers/NMBExceptionCapture.h
+++ b/SmartDeviceLink-iOS/Carthage/Build/iOS/Nimble.framework/Headers/NMBExceptionCapture.h
@@ -1,4 +1,5 @@
 #import <Foundation/Foundation.h>
+#import <dispatch/dispatch.h>
 
 @interface NMBExceptionCapture : NSObject
 
@@ -6,3 +7,5 @@
 - (void)tryBlock:(void(^)())unsafeBlock;
 
 @end
+
+typedef void(^NMBSourceCallbackBlock)(BOOL successful);
diff --git a/SmartDeviceLink-iOS/Carthage/Build/iOS/Nimble.framework/Headers/Nimble-Swift.h b/SmartDeviceLink-iOS/Carthage/Build/iOS/Nimble.framework/Headers/Nimble-Swift.h
index 6b083459a..cc3019ae0 100644
--- a/SmartDeviceLink-iOS/Carthage/Build/iOS/Nimble.framework/Headers/Nimble-Swift.h
+++ b/SmartDeviceLink-iOS/Carthage/Build/iOS/Nimble.framework/Headers/Nimble-Swift.h
@@ -1,4 +1,4 @@
-// Generated by Apple Swift version 2.0 (swiftlang-700.0.59 clang-700.0.72)
+// Generated by Apple Swift version 2.1.1 (swiftlang-700.1.101.15 clang-700.1.81)
 #pragma clang diagnostic push
 
 #if defined(__has_include) && __has_include(<swift/objc-prologue.h>)
@@ -112,7 +112,7 @@ SWIFT_CLASS("_TtC6Nimble14FailureMessage")
 
 
 
-/// Protocol for types that support only beEmpty()
+/// Protocol for types that support only beEmpty(), haveCount() matchers
 SWIFT_PROTOCOL("_TtP6Nimble13NMBCollection_")
 @protocol NMBCollection
 @property (nonatomic, readonly) NSInteger count;
@@ -190,6 +190,22 @@ SWIFT_CLASS("_TtC6Nimble14NMBObjCMatcher")
 - (BOOL)doesNotMatch:(NSObject * __null_unspecified (^ __nonnull)(void))actualBlock failureMessage:(FailureMessage * __nonnull)failureMessage location:(SourceLocation * __nonnull)location;
 @end
 
+@class NSNumber;
+
+@interface NMBObjCMatcher (SWIFT_EXTENSION(Nimble))
++ (NMBObjCMatcher * __nonnull)haveCountMatcher:(NSNumber * __nonnull)expected;
+@end
+
+
+@interface NMBObjCMatcher (SWIFT_EXTENSION(Nimble))
++ (NMBObjCMatcher * __nonnull)satisfyAnyOfMatcher:(NSArray<NMBObjCMatcher *> * __nonnull)matchers;
+@end
+
+
+@interface NMBObjCMatcher (SWIFT_EXTENSION(Nimble))
++ (NMBObjCMatcher * __nonnull)endWithMatcher:(id __nonnull)expected;
+@end
+
 
 @interface NMBObjCMatcher (SWIFT_EXTENSION(Nimble))
 + (NMBObjCMatcher * __nonnull)beNilMatcher;
@@ -212,7 +228,7 @@ SWIFT_CLASS("_TtC6Nimble14NMBObjCMatcher")
 
 
 @interface NMBObjCMatcher (SWIFT_EXTENSION(Nimble))
-+ (NMBObjCMatcher * __nonnull)beGreaterThanOrEqualToMatcher:(id <NMBComparable> __nullable)expected;
++ (NMBObjCMatcher * __nonnull)containMatcher:(NSArray<NSObject *> * __nonnull)expected;
 @end
 
 @class NMBObjCRaiseExceptionMatcher;
@@ -262,7 +278,6 @@ SWIFT_CLASS("_TtC6Nimble14NMBObjCMatcher")
 + (NMBObjCMatcher * __nonnull)beLessThanOrEqualToMatcher:(id <NMBComparable> __nullable)expected;
 @end
 
-@class NSNumber;
 
 @interface NMBObjCMatcher (SWIFT_EXTENSION(Nimble))
 + (NMBObjCBeCloseToMatcher * __nonnull)beCloseToMatcher:(NSNumber * __nonnull)expected within:(double)within;
@@ -270,12 +285,7 @@ SWIFT_CLASS("_TtC6Nimble14NMBObjCMatcher")
 
 
 @interface NMBObjCMatcher (SWIFT_EXTENSION(Nimble))
-+ (NMBObjCMatcher * __nonnull)containMatcher:(NSArray<NSObject *> * __nonnull)expected;
-@end
-
-
-@interface NMBObjCMatcher (SWIFT_EXTENSION(Nimble))
-+ (NMBObjCMatcher * __nonnull)endWithMatcher:(id __nonnull)expected;
++ (NMBObjCMatcher * __nonnull)beGreaterThanOrEqualToMatcher:(id <NMBComparable> __nullable)expected;
 @end
 
 
@@ -337,6 +347,10 @@ SWIFT_PROTOCOL("_TtP6Nimble20NMBOrderedCollection_")
 @end
 
 
+@interface NSMapTable (SWIFT_EXTENSION(Nimble)) <NMBCollection>
+@end
+
+
 @interface NSNumber (SWIFT_EXTENSION(Nimble)) <NMBDoubleConvertible>
 @end
 
diff --git a/SmartDeviceLink-iOS/Carthage/Build/iOS/Nimble.framework/Headers/Nimble.h b/SmartDeviceLink-iOS/Carthage/Build/iOS/Nimble.framework/Headers/Nimble.h
index 433621887..296760ca7 100644
--- a/SmartDeviceLink-iOS/Carthage/Build/iOS/Nimble.framework/Headers/Nimble.h
+++ b/SmartDeviceLink-iOS/Carthage/Build/iOS/Nimble.framework/Headers/Nimble.h
@@ -1,6 +1,6 @@
 #import <Foundation/Foundation.h>
-#import <Nimble/NMBExceptionCapture.h>
-#import <Nimble/DSL.h>
+#import "NMBExceptionCapture.h"
+#import "DSL.h"
 
 FOUNDATION_EXPORT double NimbleVersionNumber;
-FOUNDATION_EXPORT const unsigned char NimbleVersionString[];
+FOUNDATION_EXPORT const unsigned char NimbleVersionString[];
\ No newline at end of file
diff --git a/SmartDeviceLink-iOS/Carthage/Build/iOS/Nimble.framework/Info.plist b/SmartDeviceLink-iOS/Carthage/Build/iOS/Nimble.framework/Info.plist
index b91e50a08..94c91ae0c 100644
--- a/SmartDeviceLink-iOS/Carthage/Build/iOS/Nimble.framework/Info.plist
+++ b/SmartDeviceLink-iOS/Carthage/Build/iOS/Nimble.framework/Info.plist
diff --git a/SmartDeviceLink-iOS/Carthage/Build/iOS/Nimble.framework/Modules/Nimble.swiftmodule/arm.swiftdoc b/SmartDeviceLink-iOS/Carthage/Build/iOS/Nimble.framework/Modules/Nimble.swiftmodule/arm.swiftdoc
index ecdb5a69e..4caecf642 100644
--- a/SmartDeviceLink-iOS/Carthage/Build/iOS/Nimble.framework/Modules/Nimble.swiftmodule/arm.swiftdoc
+++ b/SmartDeviceLink-iOS/Carthage/Build/iOS/Nimble.framework/Modules/Nimble.swiftmodule/arm.swiftdoc
diff --git a/SmartDeviceLink-iOS/Carthage/Build/iOS/Nimble.framework/Modules/Nimble.swiftmodule/arm.swiftmodule b/SmartDeviceLink-iOS/Carthage/Build/iOS/Nimble.framework/Modules/Nimble.swiftmodule/arm.swiftmodule
index 45c645074..edbe17a17 100644
--- a/SmartDeviceLink-iOS/Carthage/Build/iOS/Nimble.framework/Modules/Nimble.swiftmodule/arm.swiftmodule
+++ b/SmartDeviceLink-iOS/Carthage/Build/iOS/Nimble.framework/Modules/Nimble.swiftmodule/arm.swiftmodule
diff --git a/SmartDeviceLink-iOS/Carthage/Build/iOS/Nimble.framework/Modules/Nimble.swiftmodule/arm64.swiftdoc b/SmartDeviceLink-iOS/Carthage/Build/iOS/Nimble.framework/Modules/Nimble.swiftmodule/arm64.swiftdoc
index 9f13980bb..dac00fed2 100644
--- a/SmartDeviceLink-iOS/Carthage/Build/iOS/Nimble.framework/Modules/Nimble.swiftmodule/arm64.swiftdoc
+++ b/SmartDeviceLink-iOS/Carthage/Build/iOS/Nimble.framework/Modules/Nimble.swiftmodule/arm64.swiftdoc
diff --git a/SmartDeviceLink-iOS/Carthage/Build/iOS/Nimble.framework/Modules/Nimble.swiftmodule/arm64.swiftmodule b/SmartDeviceLink-iOS/Carthage/Build/iOS/Nimble.framework/Modules/Nimble.swiftmodule/arm64.swiftmodule
index a3d04b5cf..f710dcbc9 100644
--- a/SmartDeviceLink-iOS/Carthage/Build/iOS/Nimble.framework/Modules/Nimble.swiftmodule/arm64.swiftmodule
+++ b/SmartDeviceLink-iOS/Carthage/Build/iOS/Nimble.framework/Modules/Nimble.swiftmodule/arm64.swiftmodule
diff --git a/SmartDeviceLink-iOS/Carthage/Build/iOS/Nimble.framework/Modules/Nimble.swiftmodule/i386.swiftdoc b/SmartDeviceLink-iOS/Carthage/Build/iOS/Nimble.framework/Modules/Nimble.swiftmodule/i386.swiftdoc
index 0af93e7a0..13674c926 100644
--- a/SmartDeviceLink-iOS/Carthage/Build/iOS/Nimble.framework/Modules/Nimble.swiftmodule/i386.swiftdoc
+++ b/SmartDeviceLink-iOS/Carthage/Build/iOS/Nimble.framework/Modules/Nimble.swiftmodule/i386.swiftdoc
diff --git a/SmartDeviceLink-iOS/Carthage/Build/iOS/Nimble.framework/Modules/Nimble.swiftmodule/i386.swiftmodule b/SmartDeviceLink-iOS/Carthage/Build/iOS/Nimble.framework/Modules/Nimble.swiftmodule/i386.swiftmodule
index fb6c84ebd..6c83ed1dc 100644
--- a/SmartDeviceLink-iOS/Carthage/Build/iOS/Nimble.framework/Modules/Nimble.swiftmodule/i386.swiftmodule
+++ b/SmartDeviceLink-iOS/Carthage/Build/iOS/Nimble.framework/Modules/Nimble.swiftmodule/i386.swiftmodule
diff --git a/SmartDeviceLink-iOS/Carthage/Build/iOS/Nimble.framework/Modules/Nimble.swiftmodule/x86_64.swiftdoc b/SmartDeviceLink-iOS/Carthage/Build/iOS/Nimble.framework/Modules/Nimble.swiftmodule/x86_64.swiftdoc
index c5a574ed6..7b3fdcf28 100644
--- a/SmartDeviceLink-iOS/Carthage/Build/iOS/Nimble.framework/Modules/Nimble.swiftmodule/x86_64.swiftdoc
+++ b/SmartDeviceLink-iOS/Carthage/Build/iOS/Nimble.framework/Modules/Nimble.swiftmodule/x86_64.swiftdoc
diff --git a/SmartDeviceLink-iOS/Carthage/Build/iOS/Nimble.framework/Modules/Nimble.swiftmodule/x86_64.swiftmodule b/SmartDeviceLink-iOS/Carthage/Build/iOS/Nimble.framework/Modules/Nimble.swiftmodule/x86_64.swiftmodule
index f12042f42..e1f97eb81 100644
--- a/SmartDeviceLink-iOS/Carthage/Build/iOS/Nimble.framework/Modules/Nimble.swiftmodule/x86_64.swiftmodule
+++ b/SmartDeviceLink-iOS/Carthage/Build/iOS/Nimble.framework/Modules/Nimble.swiftmodule/x86_64.swiftmodule
diff --git a/SmartDeviceLink-iOS/Carthage/Build/iOS/Nimble.framework/Nimble b/SmartDeviceLink-iOS/Carthage/Build/iOS/Nimble.framework/Nimble
index 6b7c984eb..049b32402 100755
--- a/SmartDeviceLink-iOS/Carthage/Build/iOS/Nimble.framework/Nimble
+++ b/SmartDeviceLink-iOS/Carthage/Build/iOS/Nimble.framework/Nimble
diff --git a/SmartDeviceLink-iOS/Carthage/Build/iOS/Nimble.framework/_CodeSignature/CodeResources b/SmartDeviceLink-iOS/Carthage/Build/iOS/Nimble.framework/_CodeSignature/CodeResources
index 8a7e67157..0b4c9ddf4 100644
--- a/SmartDeviceLink-iOS/Carthage/Build/iOS/Nimble.framework/_CodeSignature/CodeResources
+++ b/SmartDeviceLink-iOS/Carthage/Build/iOS/Nimble.framework/_CodeSignature/CodeResources
@@ -14,7 +14,7 @@
 		</data>
 		<key>Headers/Nimble-Swift.h</key>
 		<data>
-		5/eafmXgULL2D56G12jAMD5cO6o=
+		IqysaLM84ng73FD3OiU/4rUAcrw=
 		</data>
 		<key>Headers/Nimble.h</key>
 		<data>
@@ -22,23 +22,23 @@
 		</data>
 		<key>Info.plist</key>
 		<data>
-		FGHVVsX+p510d1GOsTFYLbj5z1s=
+		KQTUNHKNb10S92HWhUO4ToOJNss=
 		</data>
 		<key>Modules/Nimble.swiftmodule/arm.swiftdoc</key>
 		<data>
-		lSaVfyH8XbRz0WDbmqKJxc5QtbY=
+		ZoWug5SewWYwcZKS5EP693QQ9qU=
 		</data>
 		<key>Modules/Nimble.swiftmodule/arm.swiftmodule</key>
 		<data>
-		vnsEhtm+gzwpRerpgX5D2/Pt/Rk=
+		4NJ0cyJGTkTdwKyKcq7B4dXmjqU=
 		</data>
 		<key>Modules/Nimble.swiftmodule/arm64.swiftdoc</key>
 		<data>
-		6W52hA33Ca+9qq8Yiql4aY8+0Rk=
+		jheqAz/Tkgr3MUCuVmnG78jFmYQ=
 		</data>
 		<key>Modules/Nimble.swiftmodule/arm64.swiftmodule</key>
 		<data>
-		sEdEu8ni5ADQYbzIvgsWwE32riQ=
+		vlWKD5mD7bSCT8CzPg/zhA+rHiw=
 		</data>
 		<key>Modules/module.modulemap</key>
 		<data>
@@ -57,7 +57,7 @@
 		</data>
 		<key>Headers/Nimble-Swift.h</key>
 		<data>
-		5/eafmXgULL2D56G12jAMD5cO6o=
+		IqysaLM84ng73FD3OiU/4rUAcrw=
 		</data>
 		<key>Headers/Nimble.h</key>
 		<data>
@@ -65,19 +65,19 @@
 		</data>
 		<key>Modules/Nimble.swiftmodule/arm.swiftdoc</key>
 		<data>
-		lSaVfyH8XbRz0WDbmqKJxc5QtbY=
+		ZoWug5SewWYwcZKS5EP693QQ9qU=
 		</data>
 		<key>Modules/Nimble.swiftmodule/arm.swiftmodule</key>
 		<data>
-		vnsEhtm+gzwpRerpgX5D2/Pt/Rk=
+		4NJ0cyJGTkTdwKyKcq7B4dXmjqU=
 		</data>
 		<key>Modules/Nimble.swiftmodule/arm64.swiftdoc</key>
 		<data>
-		6W52hA33Ca+9qq8Yiql4aY8+0Rk=
+		jheqAz/Tkgr3MUCuVmnG78jFmYQ=
 		</data>
 		<key>Modules/Nimble.swiftmodule/arm64.swiftmodule</key>
 		<data>
-		sEdEu8ni5ADQYbzIvgsWwE32riQ=
+		vlWKD5mD7bSCT8CzPg/zhA+rHiw=
 		</data>
 		<key>Modules/module.modulemap</key>
 		<data>
diff --git a/SmartDeviceLink-iOS/Carthage/Build/iOS/Quick.framework/Headers/Quick-Swift.h b/SmartDeviceLink-iOS/Carthage/Build/iOS/Quick.framework/Headers/Quick-Swift.h
index b5f161df8..5a94f25ff 100644
--- a/SmartDeviceLink-iOS/Carthage/Build/iOS/Quick.framework/Headers/Quick-Swift.h
+++ b/SmartDeviceLink-iOS/Carthage/Build/iOS/Quick.framework/Headers/Quick-Swift.h
@@ -1,4 +1,4 @@
-// Generated by Apple Swift version 2.0 (swiftlang-700.0.57.3 clang-700.0.72)
+// Generated by Apple Swift version 2.1.1 (swiftlang-700.1.101.15 clang-700.1.81)
 #pragma clang diagnostic push
 
 #if defined(__has_include) && __has_include(<swift/objc-prologue.h>)
@@ -87,6 +87,8 @@ typedef int swift_int3  __attribute__((__ext_vector_type__(3)));
 typedef int swift_int4  __attribute__((__ext_vector_type__(4)));
 #if defined(__has_feature) && __has_feature(modules)
 @import ObjectiveC;
+@import Foundation;
+@import XCTest;
 #endif
 
 #pragma clang diagnostic ignored "-Wproperty-attribute-mismatch"
@@ -134,8 +136,6 @@ SWIFT_CLASS("_TtC5Quick13Configuration")
 /// whether that example should be excluded from the examples
 /// that are run.
 - (void)exclude:(BOOL (^ __nonnull)(Example * __nonnull))filter;
-
-/// Identical to Quick.Configuration.beforeEach, except the closure is provided with metadata on the example that the closure is being run prior to.
 - (void)beforeEachWithMetadata:(void (^ __nonnull)(ExampleMetadata * __nonnull))closure;
 
 /// Like Quick.DSL.beforeEach, this configures Quick to execute the given closure before each example that is run. The closure passed to this method is executed before each example Quick runs, globally across the test suite. You may call this method multiple times across mulitple +[QuickConfigure configure:] methods in order to define several closures to run before each example.
@@ -149,8 +149,6 @@ SWIFT_CLASS("_TtC5Quick13Configuration")
 /// \param closure The closure to be executed before each example
 /// in the test suite.
 - (void)beforeEach:(void (^ __nonnull)(void))closure;
-
-/// Identical to Quick.Configuration.afterEach, except the closure is provided with metadata on the example that the closure is being run after.
 - (void)afterEachWithMetadata:(void (^ __nonnull)(ExampleMetadata * __nonnull))closure;
 
 /// Like Quick.DSL.afterEach, this configures Quick to execute the given closure after each example that is run. The closure passed to this method is executed after each example Quick runs, globally across the test suite. You may call this method multiple times across mulitple +[QuickConfigure configure:] methods in order to define several closures to run after each example.
@@ -183,7 +181,7 @@ SWIFT_CLASS("_TtC5Quick7Example")
 @property (nonatomic) BOOL isSharedExample;
 
 /// The site at which the example is defined. This must be set correctly in order for Xcode to highlight the correct line in red when reporting a failure.
-@property (nonatomic) Callsite * __nonnull callsite;
+@property (nonatomic, strong) Callsite * __nonnull callsite;
 @property (nonatomic, readonly, copy) NSString * __nonnull description;
 
 /// The example name. A name is a concatenation of the name of the example group the example belongs to, followed by the description of the example itself.
@@ -214,7 +212,7 @@ SWIFT_CLASS("_TtC5Quick15ExampleMetadata")
 @interface ExampleMetadata : NSObject
 
 /// The example for which this metadata was collected.
-@property (nonatomic, readonly) Example * __nonnull example;
+@property (nonatomic, readonly, strong) Example * __nonnull example;
 
 /// The index at which this example was executed in the test suite.
 @property (nonatomic, readonly) NSInteger exampleIndex;
@@ -234,4 +232,29 @@ SWIFT_CLASS("_TtC5Quick6Filter")
 - (nonnull instancetype)init OBJC_DESIGNATED_INITIALIZER;
 @end
 
+
+@interface NSBundle (SWIFT_EXTENSION(Quick))
+@end
+
+
+
+/// A base class for a class cluster of Quick test suites, that should correctly build dynamic test suites for XCTest to execute.
+SWIFT_CLASS("_TtC5Quick14QuickTestSuite")
+@interface QuickTestSuite : XCTestSuite
+
+/// Construct a test suite for a specific, selected subset of test cases (rather than the default, which as all test cases).
+///
+/// If this method is called multiple times for the same test case class, e.g..
+///
+/// FooSpec/testFoo
+/// FooSpec/testBar
+///
+/// It is expected that the first call should return a valid test suite, and
+/// all subsequent calls should return <code>nil
+/// </code>.
++ (QuickTestSuite * __nullable)selectedTestSuiteForTestCaseWithName:(NSString * __nonnull)name;
+- (nonnull instancetype)initWithName:(NSString * __nonnull)name OBJC_DESIGNATED_INITIALIZER;
+- (nonnull instancetype)init OBJC_DESIGNATED_INITIALIZER;
+@end
+
 #pragma clang diagnostic pop
diff --git a/SmartDeviceLink-iOS/Carthage/Build/iOS/Quick.framework/Headers/Quick.h b/SmartDeviceLink-iOS/Carthage/Build/iOS/Quick.framework/Headers/Quick.h
index 0c1b72d75..87dad100a 100644
--- a/SmartDeviceLink-iOS/Carthage/Build/iOS/Quick.framework/Headers/Quick.h
+++ b/SmartDeviceLink-iOS/Carthage/Build/iOS/Quick.framework/Headers/Quick.h
@@ -6,8 +6,6 @@ FOUNDATION_EXPORT double QuickVersionNumber;
 //! Project version string for Quick.
 FOUNDATION_EXPORT const unsigned char QuickVersionString[];
 
-// In this header, you should import all the public headers of your framework using statements like #import <Quick/PublicHeader.h>
-
-#import <Quick/QuickSpec.h>
-#import <Quick/QCKDSL.h>
-#import <Quick/QuickConfiguration.h>
+#import "QuickSpec.h"
+#import "QCKDSL.h"
+#import "QuickConfiguration.h"
diff --git a/SmartDeviceLink-iOS/Carthage/Build/iOS/Quick.framework/Info.plist b/SmartDeviceLink-iOS/Carthage/Build/iOS/Quick.framework/Info.plist
index db919ff07..fec3141bb 100644
--- a/SmartDeviceLink-iOS/Carthage/Build/iOS/Quick.framework/Info.plist
+++ b/SmartDeviceLink-iOS/Carthage/Build/iOS/Quick.framework/Info.plist
diff --git a/SmartDeviceLink-iOS/Carthage/Build/iOS/Quick.framework/Modules/Quick.swiftmodule/arm.swiftdoc b/SmartDeviceLink-iOS/Carthage/Build/iOS/Quick.framework/Modules/Quick.swiftmodule/arm.swiftdoc
index f3f3fd667..fb2a6444e 100644
--- a/SmartDeviceLink-iOS/Carthage/Build/iOS/Quick.framework/Modules/Quick.swiftmodule/arm.swiftdoc
+++ b/SmartDeviceLink-iOS/Carthage/Build/iOS/Quick.framework/Modules/Quick.swiftmodule/arm.swiftdoc
diff --git a/SmartDeviceLink-iOS/Carthage/Build/iOS/Quick.framework/Modules/Quick.swiftmodule/arm.swiftmodule b/SmartDeviceLink-iOS/Carthage/Build/iOS/Quick.framework/Modules/Quick.swiftmodule/arm.swiftmodule
index 2af4c8fee..1482eedb9 100644
--- a/SmartDeviceLink-iOS/Carthage/Build/iOS/Quick.framework/Modules/Quick.swiftmodule/arm.swiftmodule
+++ b/SmartDeviceLink-iOS/Carthage/Build/iOS/Quick.framework/Modules/Quick.swiftmodule/arm.swiftmodule
diff --git a/SmartDeviceLink-iOS/Carthage/Build/iOS/Quick.framework/Modules/Quick.swiftmodule/arm64.swiftdoc b/SmartDeviceLink-iOS/Carthage/Build/iOS/Quick.framework/Modules/Quick.swiftmodule/arm64.swiftdoc
index 0da84dbc8..1b804226b 100644
--- a/SmartDeviceLink-iOS/Carthage/Build/iOS/Quick.framework/Modules/Quick.swiftmodule/arm64.swiftdoc
+++ b/SmartDeviceLink-iOS/Carthage/Build/iOS/Quick.framework/Modules/Quick.swiftmodule/arm64.swiftdoc
diff --git a/SmartDeviceLink-iOS/Carthage/Build/iOS/Quick.framework/Modules/Quick.swiftmodule/arm64.swiftmodule b/SmartDeviceLink-iOS/Carthage/Build/iOS/Quick.framework/Modules/Quick.swiftmodule/arm64.swiftmodule
index b32b34e8e..166fe09b0 100644
--- a/SmartDeviceLink-iOS/Carthage/Build/iOS/Quick.framework/Modules/Quick.swiftmodule/arm64.swiftmodule
+++ b/SmartDeviceLink-iOS/Carthage/Build/iOS/Quick.framework/Modules/Quick.swiftmodule/arm64.swiftmodule
diff --git a/SmartDeviceLink-iOS/Carthage/Build/iOS/Quick.framework/Modules/Quick.swiftmodule/i386.swiftdoc b/SmartDeviceLink-iOS/Carthage/Build/iOS/Quick.framework/Modules/Quick.swiftmodule/i386.swiftdoc
index 7d640c4d8..cce21c570 100644
--- a/SmartDeviceLink-iOS/Carthage/Build/iOS/Quick.framework/Modules/Quick.swiftmodule/i386.swiftdoc
+++ b/SmartDeviceLink-iOS/Carthage/Build/iOS/Quick.framework/Modules/Quick.swiftmodule/i386.swiftdoc
diff --git a/SmartDeviceLink-iOS/Carthage/Build/iOS/Quick.framework/Modules/Quick.swiftmodule/i386.swiftmodule b/SmartDeviceLink-iOS/Carthage/Build/iOS/Quick.framework/Modules/Quick.swiftmodule/i386.swiftmodule
index 0214177b3..e5fb3d777 100644
--- a/SmartDeviceLink-iOS/Carthage/Build/iOS/Quick.framework/Modules/Quick.swiftmodule/i386.swiftmodule
+++ b/SmartDeviceLink-iOS/Carthage/Build/iOS/Quick.framework/Modules/Quick.swiftmodule/i386.swiftmodule
diff --git a/SmartDeviceLink-iOS/Carthage/Build/iOS/Quick.framework/Modules/Quick.swiftmodule/x86_64.swiftdoc b/SmartDeviceLink-iOS/Carthage/Build/iOS/Quick.framework/Modules/Quick.swiftmodule/x86_64.swiftdoc
index 43d14b64b..8ee7c2567 100644
--- a/SmartDeviceLink-iOS/Carthage/Build/iOS/Quick.framework/Modules/Quick.swiftmodule/x86_64.swiftdoc
+++ b/SmartDeviceLink-iOS/Carthage/Build/iOS/Quick.framework/Modules/Quick.swiftmodule/x86_64.swiftdoc
diff --git a/SmartDeviceLink-iOS/Carthage/Build/iOS/Quick.framework/Modules/Quick.swiftmodule/x86_64.swiftmodule b/SmartDeviceLink-iOS/Carthage/Build/iOS/Quick.framework/Modules/Quick.swiftmodule/x86_64.swiftmodule
index d1c23a9b3..f212f8acf 100644
--- a/SmartDeviceLink-iOS/Carthage/Build/iOS/Quick.framework/Modules/Quick.swiftmodule/x86_64.swiftmodule
+++ b/SmartDeviceLink-iOS/Carthage/Build/iOS/Quick.framework/Modules/Quick.swiftmodule/x86_64.swiftmodule
diff --git a/SmartDeviceLink-iOS/Carthage/Build/iOS/Quick.framework/Quick b/SmartDeviceLink-iOS/Carthage/Build/iOS/Quick.framework/Quick
index e02bac6f8..8306f0026 100755
--- a/SmartDeviceLink-iOS/Carthage/Build/iOS/Quick.framework/Quick
+++ b/SmartDeviceLink-iOS/Carthage/Build/iOS/Quick.framework/Quick
diff --git a/SmartDeviceLink-iOS/Carthage/Build/iOS/Quick.framework/_CodeSignature/CodeResources b/SmartDeviceLink-iOS/Carthage/Build/iOS/Quick.framework/_CodeSignature/CodeResources
deleted file mode 100644
index b9fb19d4f..000000000
--- a/SmartDeviceLink-iOS/Carthage/Build/iOS/Quick.framework/_CodeSignature/CodeResources
+++ /dev/null
@@ -1,191 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>files</key>
-	<dict>
-		<key>Headers/QCKDSL.h</key>
-		<data>
-		ZKiC7b5Xxh1q3DnR7Y0VojsEeiQ=
-		</data>
-		<key>Headers/Quick-Swift.h</key>
-		<data>
-		nwK9/gtFsppnJUQpVfJaEI9u1JQ=
-		</data>
-		<key>Headers/Quick.h</key>
-		<data>
-		59agZ84aHaMJ7CsoHmcDe6PDCqc=
-		</data>
-		<key>Headers/QuickConfiguration.h</key>
-		<data>
-		nEtQvPA7W793Xa7hm7CqJF94SiY=
-		</data>
-		<key>Headers/QuickSpec.h</key>
-		<data>
-		JgnCxF7XdP++mBPDkQpO8cfDoKA=
-		</data>
-		<key>Info.plist</key>
-		<data>
-		yZ2Jm1H+bpdPLUxUj2awYiwboN8=
-		</data>
-		<key>Modules/Quick.swiftmodule/arm.swiftdoc</key>
-		<data>
-		jSB7WPmZ7hrMY24i9VtBZRL7id0=
-		</data>
-		<key>Modules/Quick.swiftmodule/arm.swiftmodule</key>
-		<data>
-		ApNzN1mnq3NyTyrXkdhN29RsLM0=
-		</data>
-		<key>Modules/Quick.swiftmodule/arm64.swiftdoc</key>
-		<data>
-		S+mzHjofsaICGrg37LgPK1XYym0=
-		</data>
-		<key>Modules/Quick.swiftmodule/arm64.swiftmodule</key>
-		<data>
-		WtZiJ4VshKV9hXNXM/aPWi6Tt/k=
-		</data>
-		<key>Modules/module.modulemap</key>
-		<data>
-		QfbrXg9M17t7M1mX9Yzh72ZIg20=
-		</data>
-	</dict>
-	<key>files2</key>
-	<dict>
-		<key>Headers/QCKDSL.h</key>
-		<data>
-		ZKiC7b5Xxh1q3DnR7Y0VojsEeiQ=
-		</data>
-		<key>Headers/Quick-Swift.h</key>
-		<data>
-		nwK9/gtFsppnJUQpVfJaEI9u1JQ=
-		</data>
-		<key>Headers/Quick.h</key>
-		<data>
-		59agZ84aHaMJ7CsoHmcDe6PDCqc=
-		</data>
-		<key>Headers/QuickConfiguration.h</key>
-		<data>
-		nEtQvPA7W793Xa7hm7CqJF94SiY=
-		</data>
-		<key>Headers/QuickSpec.h</key>
-		<data>
-		JgnCxF7XdP++mBPDkQpO8cfDoKA=
-		</data>
-		<key>Modules/Quick.swiftmodule/arm.swiftdoc</key>
-		<data>
-		jSB7WPmZ7hrMY24i9VtBZRL7id0=
-		</data>
-		<key>Modules/Quick.swiftmodule/arm.swiftmodule</key>
-		<data>
-		ApNzN1mnq3NyTyrXkdhN29RsLM0=
-		</data>
-		<key>Modules/Quick.swiftmodule/arm64.swiftdoc</key>
-		<data>
-		S+mzHjofsaICGrg37LgPK1XYym0=
-		</data>
-		<key>Modules/Quick.swiftmodule/arm64.swiftmodule</key>
-		<data>
-		WtZiJ4VshKV9hXNXM/aPWi6Tt/k=
-		</data>
-		<key>Modules/module.modulemap</key>
-		<data>
-		QfbrXg9M17t7M1mX9Yzh72ZIg20=
-		</data>
-	</dict>
-	<key>rules</key>
-	<dict>
-		<key>^</key>
-		<true/>
-		<key>^.*\.lproj/</key>
-		<dict>
-			<key>optional</key>
-			<true/>
-			<key>weight</key>
-			<real>1000</real>
-		</dict>
-		<key>^.*\.lproj/locversion.plist$</key>
-		<dict>
-			<key>omit</key>
-			<true/>
-			<key>weight</key>
-			<real>1100</real>
-		</dict>
-		<key>^version.plist$</key>
-		<true/>
-	</dict>
-	<key>rules2</key>
-	<dict>
-		<key>.*\.dSYM($|/)</key>
-		<dict>
-			<key>weight</key>
-			<real>11</real>
-		</dict>
-		<key>^</key>
-		<dict>
-			<key>weight</key>
-			<real>20</real>
-		</dict>
-		<key>^(.*/)?\.DS_Store$</key>
-		<dict>
-			<key>omit</key>
-			<true/>
-			<key>weight</key>
-			<real>2000</real>
-		</dict>
-		<key>^(Frameworks|SharedFrameworks|PlugIns|Plug-ins|XPCServices|Helpers|MacOS|Library/(Automator|Spotlight|LoginItems))/</key>
-		<dict>
-			<key>nested</key>
-			<true/>
-			<key>weight</key>
-			<real>10</real>
-		</dict>
-		<key>^.*</key>
-		<true/>
-		<key>^.*\.lproj/</key>
-		<dict>
-			<key>optional</key>
-			<true/>
-			<key>weight</key>
-			<real>1000</real>
-		</dict>
-		<key>^.*\.lproj/locversion.plist$</key>
-		<dict>
-			<key>omit</key>
-			<true/>
-			<key>weight</key>
-			<real>1100</real>
-		</dict>
-		<key>^Info\.plist$</key>
-		<dict>
-			<key>omit</key>
-			<true/>
-			<key>weight</key>
-			<real>20</real>
-		</dict>
-		<key>^PkgInfo$</key>
-		<dict>
-			<key>omit</key>
-			<true/>
-			<key>weight</key>
-			<real>20</real>
-		</dict>
-		<key>^[^/]+$</key>
-		<dict>
-			<key>nested</key>
-			<true/>
-			<key>weight</key>
-			<real>10</real>
-		</dict>
-		<key>^embedded\.provisionprofile$</key>
-		<dict>
-			<key>weight</key>
-			<real>20</real>
-		</dict>
-		<key>^version\.plist$</key>
-		<dict>
-			<key>weight</key>
-			<real>20</real>
-		</dict>
-	</dict>
-</dict>
-</plist>
diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/SDLAddCommand.m b/SmartDeviceLink-iOS/SmartDeviceLink/SDLAddCommand.m
index bb7692127..b0de0f49e 100644
--- a/SmartDeviceLink-iOS/SmartDeviceLink/SDLAddCommand.m
+++ b/SmartDeviceLink-iOS/SmartDeviceLink/SDLAddCommand.m
@@ -45,7 +45,7 @@
 
 - (SDLMenuParams *)menuParams {
     NSObject *obj = [parameters objectForKey:NAMES_menuParams];
-    if ([obj isKindOfClass:SDLMenuParams.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLMenuParams.class]) {
         return (SDLMenuParams *)obj;
     } else {
         return [[SDLMenuParams alloc] initWithDictionary:(NSMutableDictionary *)obj];
@@ -74,7 +74,7 @@
 
 - (SDLImage *)cmdIcon {
     NSObject *obj = [parameters objectForKey:NAMES_cmdIcon];
-    if ([obj isKindOfClass:SDLImage.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLImage.class]) {
         return (SDLImage *)obj;
     } else {
         return [[SDLImage alloc] initWithDictionary:(NSMutableDictionary *)obj];
diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/SDLAirbagStatus.m b/SmartDeviceLink-iOS/SmartDeviceLink/SDLAirbagStatus.m
index 6565c0270..a3ce06689 100644
--- a/SmartDeviceLink-iOS/SmartDeviceLink/SDLAirbagStatus.m
+++ b/SmartDeviceLink-iOS/SmartDeviceLink/SDLAirbagStatus.m
@@ -30,7 +30,7 @@
 
 - (SDLVehicleDataEventStatus *)driverAirbagDeployed {
     NSObject *obj = [store objectForKey:NAMES_driverAirbagDeployed];
-    if ([obj isKindOfClass:SDLVehicleDataEventStatus.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLVehicleDataEventStatus.class]) {
         return (SDLVehicleDataEventStatus *)obj;
     } else {
         return [SDLVehicleDataEventStatus valueOf:(NSString *)obj];
@@ -47,7 +47,7 @@
 
 - (SDLVehicleDataEventStatus *)driverSideAirbagDeployed {
     NSObject *obj = [store objectForKey:NAMES_driverSideAirbagDeployed];
-    if ([obj isKindOfClass:SDLVehicleDataEventStatus.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLVehicleDataEventStatus.class]) {
         return (SDLVehicleDataEventStatus *)obj;
     } else {
         return [SDLVehicleDataEventStatus valueOf:(NSString *)obj];
@@ -64,7 +64,7 @@
 
 - (SDLVehicleDataEventStatus *)driverCurtainAirbagDeployed {
     NSObject *obj = [store objectForKey:NAMES_driverCurtainAirbagDeployed];
-    if ([obj isKindOfClass:SDLVehicleDataEventStatus.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLVehicleDataEventStatus.class]) {
         return (SDLVehicleDataEventStatus *)obj;
     } else {
         return [SDLVehicleDataEventStatus valueOf:(NSString *)obj];
@@ -81,7 +81,7 @@
 
 - (SDLVehicleDataEventStatus *)passengerAirbagDeployed {
     NSObject *obj = [store objectForKey:NAMES_passengerAirbagDeployed];
-    if ([obj isKindOfClass:SDLVehicleDataEventStatus.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLVehicleDataEventStatus.class]) {
         return (SDLVehicleDataEventStatus *)obj;
     } else {
         return [SDLVehicleDataEventStatus valueOf:(NSString *)obj];
@@ -98,7 +98,7 @@
 
 - (SDLVehicleDataEventStatus *)passengerCurtainAirbagDeployed {
     NSObject *obj = [store objectForKey:NAMES_passengerCurtainAirbagDeployed];
-    if ([obj isKindOfClass:SDLVehicleDataEventStatus.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLVehicleDataEventStatus.class]) {
         return (SDLVehicleDataEventStatus *)obj;
     } else {
         return [SDLVehicleDataEventStatus valueOf:(NSString *)obj];
@@ -115,7 +115,7 @@
 
 - (SDLVehicleDataEventStatus *)driverKneeAirbagDeployed {
     NSObject *obj = [store objectForKey:NAMES_driverKneeAirbagDeployed];
-    if ([obj isKindOfClass:SDLVehicleDataEventStatus.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLVehicleDataEventStatus.class]) {
         return (SDLVehicleDataEventStatus *)obj;
     } else {
         return [SDLVehicleDataEventStatus valueOf:(NSString *)obj];
@@ -132,7 +132,7 @@
 
 - (SDLVehicleDataEventStatus *)passengerSideAirbagDeployed {
     NSObject *obj = [store objectForKey:NAMES_passengerSideAirbagDeployed];
-    if ([obj isKindOfClass:SDLVehicleDataEventStatus.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLVehicleDataEventStatus.class]) {
         return (SDLVehicleDataEventStatus *)obj;
     } else {
         return [SDLVehicleDataEventStatus valueOf:(NSString *)obj];
@@ -149,7 +149,7 @@
 
 - (SDLVehicleDataEventStatus *)passengerKneeAirbagDeployed {
     NSObject *obj = [store objectForKey:NAMES_passengerKneeAirbagDeployed];
-    if ([obj isKindOfClass:SDLVehicleDataEventStatus.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLVehicleDataEventStatus.class]) {
         return (SDLVehicleDataEventStatus *)obj;
     } else {
         return [SDLVehicleDataEventStatus valueOf:(NSString *)obj];
diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/SDLAudioPassThruCapabilities.m b/SmartDeviceLink-iOS/SmartDeviceLink/SDLAudioPassThruCapabilities.m
index feecdc19b..fbb02be84 100644
--- a/SmartDeviceLink-iOS/SmartDeviceLink/SDLAudioPassThruCapabilities.m
+++ b/SmartDeviceLink-iOS/SmartDeviceLink/SDLAudioPassThruCapabilities.m
@@ -34,7 +34,7 @@
 
 - (SDLSamplingRate *)samplingRate {
     NSObject *obj = [store objectForKey:NAMES_samplingRate];
-    if ([obj isKindOfClass:SDLSamplingRate.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLSamplingRate.class]) {
         return (SDLSamplingRate *)obj;
     } else {
         return [SDLSamplingRate valueOf:(NSString *)obj];
@@ -51,7 +51,7 @@
 
 - (SDLBitsPerSample *)bitsPerSample {
     NSObject *obj = [store objectForKey:NAMES_bitsPerSample];
-    if ([obj isKindOfClass:SDLBitsPerSample.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLBitsPerSample.class]) {
         return (SDLBitsPerSample *)obj;
     } else {
         return [SDLBitsPerSample valueOf:(NSString *)obj];
@@ -68,7 +68,7 @@
 
 - (SDLAudioType *)audioType {
     NSObject *obj = [store objectForKey:NAMES_audioType];
-    if ([obj isKindOfClass:SDLAudioType.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLAudioType.class]) {
         return (SDLAudioType *)obj;
     } else {
         return [SDLAudioType valueOf:(NSString *)obj];
diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/SDLBeltStatus.m b/SmartDeviceLink-iOS/SmartDeviceLink/SDLBeltStatus.m
index 7f2e42376..70b54d2bd 100644
--- a/SmartDeviceLink-iOS/SmartDeviceLink/SDLBeltStatus.m
+++ b/SmartDeviceLink-iOS/SmartDeviceLink/SDLBeltStatus.m
@@ -31,7 +31,7 @@
 
 - (SDLVehicleDataEventStatus *)driverBeltDeployed {
     NSObject *obj = [store objectForKey:NAMES_driverBeltDeployed];
-    if ([obj isKindOfClass:SDLVehicleDataEventStatus.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLVehicleDataEventStatus.class]) {
         return (SDLVehicleDataEventStatus *)obj;
     } else {
         return [SDLVehicleDataEventStatus valueOf:(NSString *)obj];
@@ -48,7 +48,7 @@
 
 - (SDLVehicleDataEventStatus *)passengerBeltDeployed {
     NSObject *obj = [store objectForKey:NAMES_passengerBeltDeployed];
-    if ([obj isKindOfClass:SDLVehicleDataEventStatus.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLVehicleDataEventStatus.class]) {
         return (SDLVehicleDataEventStatus *)obj;
     } else {
         return [SDLVehicleDataEventStatus valueOf:(NSString *)obj];
@@ -65,7 +65,7 @@
 
 - (SDLVehicleDataEventStatus *)passengerBuckleBelted {
     NSObject *obj = [store objectForKey:NAMES_passengerBuckleBelted];
-    if ([obj isKindOfClass:SDLVehicleDataEventStatus.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLVehicleDataEventStatus.class]) {
         return (SDLVehicleDataEventStatus *)obj;
     } else {
         return [SDLVehicleDataEventStatus valueOf:(NSString *)obj];
@@ -82,7 +82,7 @@
 
 - (SDLVehicleDataEventStatus *)driverBuckleBelted {
     NSObject *obj = [store objectForKey:NAMES_driverBuckleBelted];
-    if ([obj isKindOfClass:SDLVehicleDataEventStatus.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLVehicleDataEventStatus.class]) {
         return (SDLVehicleDataEventStatus *)obj;
     } else {
         return [SDLVehicleDataEventStatus valueOf:(NSString *)obj];
@@ -99,7 +99,7 @@
 
 - (SDLVehicleDataEventStatus *)leftRow2BuckleBelted {
     NSObject *obj = [store objectForKey:NAMES_leftRow2BuckleBelted];
-    if ([obj isKindOfClass:SDLVehicleDataEventStatus.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLVehicleDataEventStatus.class]) {
         return (SDLVehicleDataEventStatus *)obj;
     } else {
         return [SDLVehicleDataEventStatus valueOf:(NSString *)obj];
@@ -116,7 +116,7 @@
 
 - (SDLVehicleDataEventStatus *)passengerChildDetected {
     NSObject *obj = [store objectForKey:NAMES_passengerChildDetected];
-    if ([obj isKindOfClass:SDLVehicleDataEventStatus.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLVehicleDataEventStatus.class]) {
         return (SDLVehicleDataEventStatus *)obj;
     } else {
         return [SDLVehicleDataEventStatus valueOf:(NSString *)obj];
@@ -133,7 +133,7 @@
 
 - (SDLVehicleDataEventStatus *)rightRow2BuckleBelted {
     NSObject *obj = [store objectForKey:NAMES_rightRow2BuckleBelted];
-    if ([obj isKindOfClass:SDLVehicleDataEventStatus.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLVehicleDataEventStatus.class]) {
         return (SDLVehicleDataEventStatus *)obj;
     } else {
         return [SDLVehicleDataEventStatus valueOf:(NSString *)obj];
@@ -150,7 +150,7 @@
 
 - (SDLVehicleDataEventStatus *)middleRow2BuckleBelted {
     NSObject *obj = [store objectForKey:NAMES_middleRow2BuckleBelted];
-    if ([obj isKindOfClass:SDLVehicleDataEventStatus.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLVehicleDataEventStatus.class]) {
         return (SDLVehicleDataEventStatus *)obj;
     } else {
         return [SDLVehicleDataEventStatus valueOf:(NSString *)obj];
@@ -167,7 +167,7 @@
 
 - (SDLVehicleDataEventStatus *)middleRow3BuckleBelted {
     NSObject *obj = [store objectForKey:NAMES_middleRow3BuckleBelted];
-    if ([obj isKindOfClass:SDLVehicleDataEventStatus.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLVehicleDataEventStatus.class]) {
         return (SDLVehicleDataEventStatus *)obj;
     } else {
         return [SDLVehicleDataEventStatus valueOf:(NSString *)obj];
@@ -184,7 +184,7 @@
 
 - (SDLVehicleDataEventStatus *)leftRow3BuckleBelted {
     NSObject *obj = [store objectForKey:NAMES_leftRow3BuckleBelted];
-    if ([obj isKindOfClass:SDLVehicleDataEventStatus.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLVehicleDataEventStatus.class]) {
         return (SDLVehicleDataEventStatus *)obj;
     } else {
         return [SDLVehicleDataEventStatus valueOf:(NSString *)obj];
@@ -201,7 +201,7 @@
 
 - (SDLVehicleDataEventStatus *)rightRow3BuckleBelted {
     NSObject *obj = [store objectForKey:NAMES_rightRow3BuckleBelted];
-    if ([obj isKindOfClass:SDLVehicleDataEventStatus.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLVehicleDataEventStatus.class]) {
         return (SDLVehicleDataEventStatus *)obj;
     } else {
         return [SDLVehicleDataEventStatus valueOf:(NSString *)obj];
@@ -218,7 +218,7 @@
 
 - (SDLVehicleDataEventStatus *)leftRearInflatableBelted {
     NSObject *obj = [store objectForKey:NAMES_leftRearInflatableBelted];
-    if ([obj isKindOfClass:SDLVehicleDataEventStatus.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLVehicleDataEventStatus.class]) {
         return (SDLVehicleDataEventStatus *)obj;
     } else {
         return [SDLVehicleDataEventStatus valueOf:(NSString *)obj];
@@ -235,7 +235,7 @@
 
 - (SDLVehicleDataEventStatus *)rightRearInflatableBelted {
     NSObject *obj = [store objectForKey:NAMES_rightRearInflatableBelted];
-    if ([obj isKindOfClass:SDLVehicleDataEventStatus.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLVehicleDataEventStatus.class]) {
         return (SDLVehicleDataEventStatus *)obj;
     } else {
         return [SDLVehicleDataEventStatus valueOf:(NSString *)obj];
@@ -252,7 +252,7 @@
 
 - (SDLVehicleDataEventStatus *)middleRow1BeltDeployed {
     NSObject *obj = [store objectForKey:NAMES_middleRow1BeltDeployed];
-    if ([obj isKindOfClass:SDLVehicleDataEventStatus.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLVehicleDataEventStatus.class]) {
         return (SDLVehicleDataEventStatus *)obj;
     } else {
         return [SDLVehicleDataEventStatus valueOf:(NSString *)obj];
@@ -269,7 +269,7 @@
 
 - (SDLVehicleDataEventStatus *)middleRow1BuckleBelted {
     NSObject *obj = [store objectForKey:NAMES_middleRow1BuckleBelted];
-    if ([obj isKindOfClass:SDLVehicleDataEventStatus.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLVehicleDataEventStatus.class]) {
         return (SDLVehicleDataEventStatus *)obj;
     } else {
         return [SDLVehicleDataEventStatus valueOf:(NSString *)obj];
diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/SDLBodyInformation.m b/SmartDeviceLink-iOS/SmartDeviceLink/SDLBodyInformation.m
index 6005b503b..9be7a88d6 100644
--- a/SmartDeviceLink-iOS/SmartDeviceLink/SDLBodyInformation.m
+++ b/SmartDeviceLink-iOS/SmartDeviceLink/SDLBodyInformation.m
@@ -45,7 +45,7 @@
 
 - (SDLIgnitionStableStatus *)ignitionStableStatus {
     NSObject *obj = [store objectForKey:NAMES_ignitionStableStatus];
-    if ([obj isKindOfClass:SDLIgnitionStableStatus.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLIgnitionStableStatus.class]) {
         return (SDLIgnitionStableStatus *)obj;
     } else {
         return [SDLIgnitionStableStatus valueOf:(NSString *)obj];
@@ -62,7 +62,7 @@
 
 - (SDLIgnitionStatus *)ignitionStatus {
     NSObject *obj = [store objectForKey:NAMES_ignitionStatus];
-    if ([obj isKindOfClass:SDLIgnitionStatus.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLIgnitionStatus.class]) {
         return (SDLIgnitionStatus *)obj;
     } else {
         return [SDLIgnitionStatus valueOf:(NSString *)obj];
diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/SDLButtonCapabilities.m b/SmartDeviceLink-iOS/SmartDeviceLink/SDLButtonCapabilities.m
index 6b7826448..fbcab54c9 100644
--- a/SmartDeviceLink-iOS/SmartDeviceLink/SDLButtonCapabilities.m
+++ b/SmartDeviceLink-iOS/SmartDeviceLink/SDLButtonCapabilities.m
@@ -31,7 +31,7 @@
 
 - (SDLButtonName *)name {
     NSObject *obj = [store objectForKey:NAMES_name];
-    if ([obj isKindOfClass:SDLButtonName.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLButtonName.class]) {
         return (SDLButtonName *)obj;
     } else {
         return [SDLButtonName valueOf:(NSString *)obj];
diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/SDLChangeRegistration.m b/SmartDeviceLink-iOS/SmartDeviceLink/SDLChangeRegistration.m
index fa9f9edfc..5ea0f733f 100644
--- a/SmartDeviceLink-iOS/SmartDeviceLink/SDLChangeRegistration.m
+++ b/SmartDeviceLink-iOS/SmartDeviceLink/SDLChangeRegistration.m
@@ -31,7 +31,7 @@
 
 - (SDLLanguage *)language {
     NSObject *obj = [parameters objectForKey:NAMES_language];
-    if ([obj isKindOfClass:SDLLanguage.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLLanguage.class]) {
         return (SDLLanguage *)obj;
     } else {
         return [SDLLanguage valueOf:(NSString *)obj];
@@ -48,7 +48,7 @@
 
 - (SDLLanguage *)hmiDisplayLanguage {
     NSObject *obj = [parameters objectForKey:NAMES_hmiDisplayLanguage];
-    if ([obj isKindOfClass:SDLLanguage.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLLanguage.class]) {
         return (SDLLanguage *)obj;
     } else {
         return [SDLLanguage valueOf:(NSString *)obj];
diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/SDLChoice.m b/SmartDeviceLink-iOS/SmartDeviceLink/SDLChoice.m
index 65ff8ce49..83e1d56ae 100644
--- a/SmartDeviceLink-iOS/SmartDeviceLink/SDLChoice.m
+++ b/SmartDeviceLink-iOS/SmartDeviceLink/SDLChoice.m
@@ -67,7 +67,7 @@
 
 - (SDLImage *)image {
     NSObject *obj = [store objectForKey:NAMES_image];
-    if ([obj isKindOfClass:SDLImage.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLImage.class]) {
         return (SDLImage *)obj;
     } else {
         return [[SDLImage alloc] initWithDictionary:(NSMutableDictionary *)obj];
@@ -108,7 +108,7 @@
 
 - (SDLImage *)secondaryImage {
     NSObject *obj = [store objectForKey:NAMES_secondaryImage];
-    if ([obj isKindOfClass:SDLImage.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLImage.class]) {
         return (SDLImage *)obj;
     } else {
         return [[SDLImage alloc] initWithDictionary:(NSMutableDictionary *)obj];
diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/SDLClusterModeStatus.m b/SmartDeviceLink-iOS/SmartDeviceLink/SDLClusterModeStatus.m
index 719f3ca9f..ecd2a528b 100644
--- a/SmartDeviceLink-iOS/SmartDeviceLink/SDLClusterModeStatus.m
+++ b/SmartDeviceLink-iOS/SmartDeviceLink/SDLClusterModeStatus.m
@@ -45,7 +45,7 @@
 
 - (SDLPowerModeQualificationStatus *)powerModeQualificationStatus {
     NSObject *obj = [store objectForKey:NAMES_powerModeQualificationStatus];
-    if ([obj isKindOfClass:SDLPowerModeQualificationStatus.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLPowerModeQualificationStatus.class]) {
         return (SDLPowerModeQualificationStatus *)obj;
     } else {
         return [SDLPowerModeQualificationStatus valueOf:(NSString *)obj];
@@ -62,7 +62,7 @@
 
 - (SDLCarModeStatus *)carModeStatus {
     NSObject *obj = [store objectForKey:NAMES_carModeStatus];
-    if ([obj isKindOfClass:SDLCarModeStatus.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLCarModeStatus.class]) {
         return (SDLCarModeStatus *)obj;
     } else {
         return [SDLCarModeStatus valueOf:(NSString *)obj];
@@ -79,7 +79,7 @@
 
 - (SDLPowerModeStatus *)powerModeStatus {
     NSObject *obj = [store objectForKey:NAMES_powerModeStatus];
-    if ([obj isKindOfClass:SDLPowerModeStatus.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLPowerModeStatus.class]) {
         return (SDLPowerModeStatus *)obj;
     } else {
         return [SDLPowerModeStatus valueOf:(NSString *)obj];
diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/SDLConsoleController.m b/SmartDeviceLink-iOS/SmartDeviceLink/SDLConsoleController.m
index a96af0a1a..bf7f600ec 100644
--- a/SmartDeviceLink-iOS/SmartDeviceLink/SDLConsoleController.m
+++ b/SmartDeviceLink-iOS/SmartDeviceLink/SDLConsoleController.m
@@ -172,7 +172,7 @@
     id obj = [currentDictionary objectForKey:@"object"];
 
     NSString *alertText = nil;
-    if ([obj isKindOfClass:SDLRPCMessage.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLRPCMessage.class]) {
         SDLRPCMessage *rpc = obj;
         NSDictionary *dictionary = [rpc serializeAsDictionary:2];
         NSError *error = nil;
diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/SDLDIDResult.m b/SmartDeviceLink-iOS/SmartDeviceLink/SDLDIDResult.m
index 9061d701f..be42582e7 100644
--- a/SmartDeviceLink-iOS/SmartDeviceLink/SDLDIDResult.m
+++ b/SmartDeviceLink-iOS/SmartDeviceLink/SDLDIDResult.m
@@ -31,7 +31,7 @@
 
 - (SDLVehicleDataResultCode *)resultCode {
     NSObject *obj = [store objectForKey:NAMES_resultCode];
-    if ([obj isKindOfClass:SDLVehicleDataResultCode.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLVehicleDataResultCode.class]) {
         return (SDLVehicleDataResultCode *)obj;
     } else {
         return [SDLVehicleDataResultCode valueOf:(NSString *)obj];
diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/SDLDeviceStatus.m b/SmartDeviceLink-iOS/SmartDeviceLink/SDLDeviceStatus.m
index f0eb8e2ab..fbe3b4b96 100644
--- a/SmartDeviceLink-iOS/SmartDeviceLink/SDLDeviceStatus.m
+++ b/SmartDeviceLink-iOS/SmartDeviceLink/SDLDeviceStatus.m
@@ -92,7 +92,7 @@
 
 - (SDLDeviceLevelStatus *)battLevelStatus {
     NSObject *obj = [store objectForKey:NAMES_battLevelStatus];
-    if ([obj isKindOfClass:SDLDeviceLevelStatus.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLDeviceLevelStatus.class]) {
         return (SDLDeviceLevelStatus *)obj;
     } else {
         return [SDLDeviceLevelStatus valueOf:(NSString *)obj];
@@ -133,7 +133,7 @@
 
 - (SDLDeviceLevelStatus *)signalLevelStatus {
     NSObject *obj = [store objectForKey:NAMES_signalLevelStatus];
-    if ([obj isKindOfClass:SDLDeviceLevelStatus.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLDeviceLevelStatus.class]) {
         return (SDLDeviceLevelStatus *)obj;
     } else {
         return [SDLDeviceLevelStatus valueOf:(NSString *)obj];
@@ -150,7 +150,7 @@
 
 - (SDLPrimaryAudioSource *)primaryAudioSource {
     NSObject *obj = [store objectForKey:NAMES_primaryAudioSource];
-    if ([obj isKindOfClass:SDLPrimaryAudioSource.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLPrimaryAudioSource.class]) {
         return (SDLPrimaryAudioSource *)obj;
     } else {
         return [SDLPrimaryAudioSource valueOf:(NSString *)obj];
diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/SDLDisplayCapabilities.m b/SmartDeviceLink-iOS/SmartDeviceLink/SDLDisplayCapabilities.m
index 2b805dca7..07ae53d62 100644
--- a/SmartDeviceLink-iOS/SmartDeviceLink/SDLDisplayCapabilities.m
+++ b/SmartDeviceLink-iOS/SmartDeviceLink/SDLDisplayCapabilities.m
@@ -35,7 +35,7 @@
 
 - (SDLDisplayType *)displayType {
     NSObject *obj = [store objectForKey:NAMES_displayType];
-    if ([obj isKindOfClass:SDLDisplayType.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLDisplayType.class]) {
         return (SDLDisplayType *)obj;
     } else {
         return [SDLDisplayType valueOf:(NSString *)obj];
@@ -139,7 +139,7 @@
 
 - (SDLScreenParams *)screenParams {
     NSObject *obj = [store objectForKey:NAMES_screenParams];
-    if ([obj isKindOfClass:SDLScreenParams.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLScreenParams.class]) {
         return (SDLScreenParams *)obj;
     } else {
         return [[SDLScreenParams alloc] initWithDictionary:(NSMutableDictionary *)obj];
diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/SDLECallInfo.m b/SmartDeviceLink-iOS/SmartDeviceLink/SDLECallInfo.m
index 5c5e8fd0b..44046fcd0 100644
--- a/SmartDeviceLink-iOS/SmartDeviceLink/SDLECallInfo.m
+++ b/SmartDeviceLink-iOS/SmartDeviceLink/SDLECallInfo.m
@@ -32,7 +32,7 @@
 
 - (SDLVehicleDataNotificationStatus *)eCallNotificationStatus {
     NSObject *obj = [store objectForKey:NAMES_eCallNotificationStatus];
-    if ([obj isKindOfClass:SDLVehicleDataNotificationStatus.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLVehicleDataNotificationStatus.class]) {
         return (SDLVehicleDataNotificationStatus *)obj;
     } else {
         return [SDLVehicleDataNotificationStatus valueOf:(NSString *)obj];
@@ -49,7 +49,7 @@
 
 - (SDLVehicleDataNotificationStatus *)auxECallNotificationStatus {
     NSObject *obj = [store objectForKey:NAMES_auxECallNotificationStatus];
-    if ([obj isKindOfClass:SDLVehicleDataNotificationStatus.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLVehicleDataNotificationStatus.class]) {
         return (SDLVehicleDataNotificationStatus *)obj;
     } else {
         return [SDLVehicleDataNotificationStatus valueOf:(NSString *)obj];
@@ -66,7 +66,7 @@
 
 - (SDLECallConfirmationStatus *)eCallConfirmationStatus {
     NSObject *obj = [store objectForKey:NAMES_eCallConfirmationStatus];
-    if ([obj isKindOfClass:SDLECallConfirmationStatus.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLECallConfirmationStatus.class]) {
         return (SDLECallConfirmationStatus *)obj;
     } else {
         return [SDLECallConfirmationStatus valueOf:(NSString *)obj];
diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/SDLEmergencyEvent.m b/SmartDeviceLink-iOS/SmartDeviceLink/SDLEmergencyEvent.m
index 307253dfa..76fca57e2 100644
--- a/SmartDeviceLink-iOS/SmartDeviceLink/SDLEmergencyEvent.m
+++ b/SmartDeviceLink-iOS/SmartDeviceLink/SDLEmergencyEvent.m
@@ -33,7 +33,7 @@
 
 - (SDLEmergencyEventType *)emergencyEventType {
     NSObject *obj = [store objectForKey:NAMES_emergencyEventType];
-    if ([obj isKindOfClass:SDLEmergencyEventType.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLEmergencyEventType.class]) {
         return (SDLEmergencyEventType *)obj;
     } else {
         return [SDLEmergencyEventType valueOf:(NSString *)obj];
@@ -50,7 +50,7 @@
 
 - (SDLFuelCutoffStatus *)fuelCutoffStatus {
     NSObject *obj = [store objectForKey:NAMES_fuelCutoffStatus];
-    if ([obj isKindOfClass:SDLFuelCutoffStatus.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLFuelCutoffStatus.class]) {
         return (SDLFuelCutoffStatus *)obj;
     } else {
         return [SDLFuelCutoffStatus valueOf:(NSString *)obj];
@@ -67,7 +67,7 @@
 
 - (SDLVehicleDataEventStatus *)rolloverEvent {
     NSObject *obj = [store objectForKey:NAMES_rolloverEvent];
-    if ([obj isKindOfClass:SDLVehicleDataEventStatus.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLVehicleDataEventStatus.class]) {
         return (SDLVehicleDataEventStatus *)obj;
     } else {
         return [SDLVehicleDataEventStatus valueOf:(NSString *)obj];
@@ -96,7 +96,7 @@
 
 - (SDLVehicleDataEventStatus *)multipleEvents {
     NSObject *obj = [store objectForKey:NAMES_multipleEvents];
-    if ([obj isKindOfClass:SDLVehicleDataEventStatus.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLVehicleDataEventStatus.class]) {
         return (SDLVehicleDataEventStatus *)obj;
     } else {
         return [SDLVehicleDataEventStatus valueOf:(NSString *)obj];
diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/SDLGPSData.m b/SmartDeviceLink-iOS/SmartDeviceLink/SDLGPSData.m
index c8a8a502e..1cec52112 100644
--- a/SmartDeviceLink-iOS/SmartDeviceLink/SDLGPSData.m
+++ b/SmartDeviceLink-iOS/SmartDeviceLink/SDLGPSData.m
@@ -128,7 +128,7 @@
 
 - (SDLCompassDirection *)compassDirection {
     NSObject *obj = [store objectForKey:NAMES_compassDirection];
-    if ([obj isKindOfClass:SDLCompassDirection.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLCompassDirection.class]) {
         return (SDLCompassDirection *)obj;
     } else {
         return [SDLCompassDirection valueOf:(NSString *)obj];
@@ -205,7 +205,7 @@
 
 - (SDLDimension *)dimension {
     NSObject *obj = [store objectForKey:NAMES_dimension];
-    if ([obj isKindOfClass:SDLDimension.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLDimension.class]) {
         return (SDLDimension *)obj;
     } else {
         return [SDLDimension valueOf:(NSString *)obj];
diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/SDLGetVehicleDataResponse.m b/SmartDeviceLink-iOS/SmartDeviceLink/SDLGetVehicleDataResponse.m
index 35d85e4ec..7f1bdb351 100644
--- a/SmartDeviceLink-iOS/SmartDeviceLink/SDLGetVehicleDataResponse.m
+++ b/SmartDeviceLink-iOS/SmartDeviceLink/SDLGetVehicleDataResponse.m
@@ -46,7 +46,7 @@
 
 - (SDLGPSData *)gps {
     NSObject *obj = [parameters objectForKey:NAMES_gps];
-    if ([obj isKindOfClass:SDLGPSData.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLGPSData.class]) {
         return (SDLGPSData *)obj;
     } else {
         return [[SDLGPSData alloc] initWithDictionary:(NSMutableDictionary *)obj];
@@ -99,7 +99,7 @@
 
 - (SDLComponentVolumeStatus *)fuelLevel_State {
     NSObject *obj = [parameters objectForKey:NAMES_fuelLevel_State];
-    if ([obj isKindOfClass:SDLComponentVolumeStatus.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLComponentVolumeStatus.class]) {
         return (SDLComponentVolumeStatus *)obj;
     } else {
         return [SDLComponentVolumeStatus valueOf:(NSString *)obj];
@@ -152,7 +152,7 @@
 
 - (SDLPRNDL *)prndl {
     NSObject *obj = [parameters objectForKey:NAMES_prndl];
-    if ([obj isKindOfClass:SDLPRNDL.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLPRNDL.class]) {
         return (SDLPRNDL *)obj;
     } else {
         return [SDLPRNDL valueOf:(NSString *)obj];
@@ -169,7 +169,7 @@
 
 - (SDLTireStatus *)tirePressure {
     NSObject *obj = [parameters objectForKey:NAMES_tirePressure];
-    if ([obj isKindOfClass:SDLTireStatus.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLTireStatus.class]) {
         return (SDLTireStatus *)obj;
     } else {
         return [[SDLTireStatus alloc] initWithDictionary:(NSMutableDictionary *)obj];
@@ -198,7 +198,7 @@
 
 - (SDLBeltStatus *)beltStatus {
     NSObject *obj = [parameters objectForKey:NAMES_beltStatus];
-    if ([obj isKindOfClass:SDLBeltStatus.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLBeltStatus.class]) {
         return (SDLBeltStatus *)obj;
     } else {
         return [[SDLBeltStatus alloc] initWithDictionary:(NSMutableDictionary *)obj];
@@ -215,7 +215,7 @@
 
 - (SDLBodyInformation *)bodyInformation {
     NSObject *obj = [parameters objectForKey:NAMES_bodyInformation];
-    if ([obj isKindOfClass:SDLBodyInformation.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLBodyInformation.class]) {
         return (SDLBodyInformation *)obj;
     } else {
         return [[SDLBodyInformation alloc] initWithDictionary:(NSMutableDictionary *)obj];
@@ -232,7 +232,7 @@
 
 - (SDLDeviceStatus *)deviceStatus {
     NSObject *obj = [parameters objectForKey:NAMES_deviceStatus];
-    if ([obj isKindOfClass:SDLDeviceStatus.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLDeviceStatus.class]) {
         return (SDLDeviceStatus *)obj;
     } else {
         return [[SDLDeviceStatus alloc] initWithDictionary:(NSMutableDictionary *)obj];
@@ -249,7 +249,7 @@
 
 - (SDLVehicleDataEventStatus *)driverBraking {
     NSObject *obj = [parameters objectForKey:NAMES_driverBraking];
-    if ([obj isKindOfClass:SDLVehicleDataEventStatus.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLVehicleDataEventStatus.class]) {
         return (SDLVehicleDataEventStatus *)obj;
     } else {
         return [SDLVehicleDataEventStatus valueOf:(NSString *)obj];
@@ -266,7 +266,7 @@
 
 - (SDLWiperStatus *)wiperStatus {
     NSObject *obj = [parameters objectForKey:NAMES_wiperStatus];
-    if ([obj isKindOfClass:SDLWiperStatus.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLWiperStatus.class]) {
         return (SDLWiperStatus *)obj;
     } else {
         return [SDLWiperStatus valueOf:(NSString *)obj];
@@ -283,7 +283,7 @@
 
 - (SDLHeadLampStatus *)headLampStatus {
     NSObject *obj = [parameters objectForKey:NAMES_headLampStatus];
-    if ([obj isKindOfClass:SDLHeadLampStatus.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLHeadLampStatus.class]) {
         return (SDLHeadLampStatus *)obj;
     } else {
         return [[SDLHeadLampStatus alloc] initWithDictionary:(NSMutableDictionary *)obj];
@@ -336,7 +336,7 @@
 
 - (SDLECallInfo *)eCallInfo {
     NSObject *obj = [parameters objectForKey:NAMES_eCallInfo];
-    if ([obj isKindOfClass:SDLECallInfo.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLECallInfo.class]) {
         return (SDLECallInfo *)obj;
     } else {
         return [[SDLECallInfo alloc] initWithDictionary:(NSMutableDictionary *)obj];
@@ -353,7 +353,7 @@
 
 - (SDLAirbagStatus *)airbagStatus {
     NSObject *obj = [parameters objectForKey:NAMES_airbagStatus];
-    if ([obj isKindOfClass:SDLAirbagStatus.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLAirbagStatus.class]) {
         return (SDLAirbagStatus *)obj;
     } else {
         return [[SDLAirbagStatus alloc] initWithDictionary:(NSMutableDictionary *)obj];
@@ -370,7 +370,7 @@
 
 - (SDLEmergencyEvent *)emergencyEvent {
     NSObject *obj = [parameters objectForKey:NAMES_emergencyEvent];
-    if ([obj isKindOfClass:SDLEmergencyEvent.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLEmergencyEvent.class]) {
         return (SDLEmergencyEvent *)obj;
     } else {
         return [[SDLEmergencyEvent alloc] initWithDictionary:(NSMutableDictionary *)obj];
@@ -387,7 +387,7 @@
 
 - (SDLClusterModeStatus *)clusterModeStatus {
     NSObject *obj = [parameters objectForKey:NAMES_clusterModeStatus];
-    if ([obj isKindOfClass:SDLClusterModeStatus.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLClusterModeStatus.class]) {
         return (SDLClusterModeStatus *)obj;
     } else {
         return [[SDLClusterModeStatus alloc] initWithDictionary:(NSMutableDictionary *)obj];
@@ -404,7 +404,7 @@
 
 - (SDLMyKey *)myKey {
     NSObject *obj = [parameters objectForKey:NAMES_myKey];
-    if ([obj isKindOfClass:SDLMyKey.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLMyKey.class]) {
         return (SDLMyKey *)obj;
     } else {
         return [[SDLMyKey alloc] initWithDictionary:(NSMutableDictionary *)obj];
diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/SDLHeadLampStatus.m b/SmartDeviceLink-iOS/SmartDeviceLink/SDLHeadLampStatus.m
index a2e2d1c18..44ed87b44 100644
--- a/SmartDeviceLink-iOS/SmartDeviceLink/SDLHeadLampStatus.m
+++ b/SmartDeviceLink-iOS/SmartDeviceLink/SDLHeadLampStatus.m
@@ -55,7 +55,7 @@
 
 - (SDLAmbientLightStatus *)ambientLightSensorStatus {
     NSObject *obj = [store objectForKey:NAMES_ambientLightSensorStatus];
-    if ([obj isKindOfClass:SDLAmbientLightStatus.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLAmbientLightStatus.class]) {
         return (SDLAmbientLightStatus *)obj;
     } else {
         return [SDLAmbientLightStatus valueOf:(NSString *)obj];
diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/SDLImage.m b/SmartDeviceLink-iOS/SmartDeviceLink/SDLImage.m
index 89a70bca6..ef646f794 100644
--- a/SmartDeviceLink-iOS/SmartDeviceLink/SDLImage.m
+++ b/SmartDeviceLink-iOS/SmartDeviceLink/SDLImage.m
@@ -43,7 +43,7 @@
 
 - (SDLImageType *)imageType {
     NSObject *obj = [store objectForKey:NAMES_imageType];
-    if ([obj isKindOfClass:SDLImageType.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLImageType.class]) {
         return (SDLImageType *)obj;
     } else {
         return [SDLImageType valueOf:(NSString *)obj];
diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/SDLImageField.m b/SmartDeviceLink-iOS/SmartDeviceLink/SDLImageField.m
index c59ad6817..af4f15517 100644
--- a/SmartDeviceLink-iOS/SmartDeviceLink/SDLImageField.m
+++ b/SmartDeviceLink-iOS/SmartDeviceLink/SDLImageField.m
@@ -33,7 +33,7 @@
 
 - (SDLImageFieldName *)name {
     NSObject *obj = [store objectForKey:NAMES_name];
-    if ([obj isKindOfClass:SDLImageFieldName.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLImageFieldName.class]) {
         return (SDLImageFieldName *)obj;
     } else {
         return [SDLImageFieldName valueOf:(NSString *)obj];
@@ -71,7 +71,7 @@
 
 - (SDLImageResolution *)imageResolution {
     NSObject *obj = [store objectForKey:NAMES_imageResolution];
-    if ([obj isKindOfClass:SDLImageResolution.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLImageResolution.class]) {
         return (SDLImageResolution *)obj;
     } else {
         return [[SDLImageResolution alloc] initWithDictionary:(NSMutableDictionary *)obj];
diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/SDLKeyboardProperties.m b/SmartDeviceLink-iOS/SmartDeviceLink/SDLKeyboardProperties.m
index 941e2cd56..896f3a99a 100644
--- a/SmartDeviceLink-iOS/SmartDeviceLink/SDLKeyboardProperties.m
+++ b/SmartDeviceLink-iOS/SmartDeviceLink/SDLKeyboardProperties.m
@@ -33,7 +33,7 @@
 
 - (SDLLanguage *)language {
     NSObject *obj = [store objectForKey:NAMES_language];
-    if ([obj isKindOfClass:SDLLanguage.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLLanguage.class]) {
         return (SDLLanguage *)obj;
     } else {
         return [SDLLanguage valueOf:(NSString *)obj];
@@ -50,7 +50,7 @@
 
 - (SDLKeyboardLayout *)keyboardLayout {
     NSObject *obj = [store objectForKey:NAMES_keyboardLayout];
-    if ([obj isKindOfClass:SDLKeyboardLayout.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLKeyboardLayout.class]) {
         return (SDLKeyboardLayout *)obj;
     } else {
         return [SDLKeyboardLayout valueOf:(NSString *)obj];
@@ -67,7 +67,7 @@
 
 - (SDLKeypressMode *)keypressMode {
     NSObject *obj = [store objectForKey:NAMES_keypressMode];
-    if ([obj isKindOfClass:SDLKeypressMode.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLKeypressMode.class]) {
         return (SDLKeypressMode *)obj;
     } else {
         return [SDLKeypressMode valueOf:(NSString *)obj];
diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/SDLMyKey.m b/SmartDeviceLink-iOS/SmartDeviceLink/SDLMyKey.m
index d5a04f37e..ec4e5ef95 100644
--- a/SmartDeviceLink-iOS/SmartDeviceLink/SDLMyKey.m
+++ b/SmartDeviceLink-iOS/SmartDeviceLink/SDLMyKey.m
@@ -31,7 +31,7 @@
 
 - (SDLVehicleDataStatus *)e911Override {
     NSObject *obj = [store objectForKey:NAMES_e911Override];
-    if ([obj isKindOfClass:SDLVehicleDataStatus.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLVehicleDataStatus.class]) {
         return (SDLVehicleDataStatus *)obj;
     } else {
         return [SDLVehicleDataStatus valueOf:(NSString *)obj];
diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/SDLOnAppInterfaceUnregistered.m b/SmartDeviceLink-iOS/SmartDeviceLink/SDLOnAppInterfaceUnregistered.m
index 3cdaa07b4..5427cf871 100644
--- a/SmartDeviceLink-iOS/SmartDeviceLink/SDLOnAppInterfaceUnregistered.m
+++ b/SmartDeviceLink-iOS/SmartDeviceLink/SDLOnAppInterfaceUnregistered.m
@@ -31,7 +31,7 @@
 
 - (SDLAppInterfaceUnregisteredReason *)reason {
     NSObject *obj = [parameters objectForKey:NAMES_reason];
-    if ([obj isKindOfClass:SDLAppInterfaceUnregisteredReason.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLAppInterfaceUnregisteredReason.class]) {
         return (SDLAppInterfaceUnregisteredReason *)obj;
     } else {
         return [SDLAppInterfaceUnregisteredReason valueOf:(NSString *)obj];
diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/SDLOnButtonEvent.m b/SmartDeviceLink-iOS/SmartDeviceLink/SDLOnButtonEvent.m
index 4b7a86a44..c8d9797f2 100644
--- a/SmartDeviceLink-iOS/SmartDeviceLink/SDLOnButtonEvent.m
+++ b/SmartDeviceLink-iOS/SmartDeviceLink/SDLOnButtonEvent.m
@@ -32,7 +32,7 @@
 
 - (SDLButtonName *)buttonName {
     NSObject *obj = [parameters objectForKey:NAMES_buttonName];
-    if ([obj isKindOfClass:SDLButtonName.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLButtonName.class]) {
         return (SDLButtonName *)obj;
     } else {
         return [SDLButtonName valueOf:(NSString *)obj];
@@ -49,7 +49,7 @@
 
 - (SDLButtonEventMode *)buttonEventMode {
     NSObject *obj = [parameters objectForKey:NAMES_buttonEventMode];
-    if ([obj isKindOfClass:SDLButtonEventMode.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLButtonEventMode.class]) {
         return (SDLButtonEventMode *)obj;
     } else {
         return [SDLButtonEventMode valueOf:(NSString *)obj];
diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/SDLOnButtonPress.m b/SmartDeviceLink-iOS/SmartDeviceLink/SDLOnButtonPress.m
index cd95587c5..8926b7951 100644
--- a/SmartDeviceLink-iOS/SmartDeviceLink/SDLOnButtonPress.m
+++ b/SmartDeviceLink-iOS/SmartDeviceLink/SDLOnButtonPress.m
@@ -32,7 +32,7 @@
 
 - (SDLButtonName *)buttonName {
     NSObject *obj = [parameters objectForKey:NAMES_buttonName];
-    if ([obj isKindOfClass:SDLButtonName.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLButtonName.class]) {
         return (SDLButtonName *)obj;
     } else {
         return [SDLButtonName valueOf:(NSString *)obj];
@@ -49,7 +49,7 @@
 
 - (SDLButtonPressMode *)buttonPressMode {
     NSObject *obj = [parameters objectForKey:NAMES_buttonPressMode];
-    if ([obj isKindOfClass:SDLButtonPressMode.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLButtonPressMode.class]) {
         return (SDLButtonPressMode *)obj;
     } else {
         return [SDLButtonPressMode valueOf:(NSString *)obj];
diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/SDLOnCommand.m b/SmartDeviceLink-iOS/SmartDeviceLink/SDLOnCommand.m
index a1f0be087..f16023d42 100644
--- a/SmartDeviceLink-iOS/SmartDeviceLink/SDLOnCommand.m
+++ b/SmartDeviceLink-iOS/SmartDeviceLink/SDLOnCommand.m
@@ -43,7 +43,7 @@
 
 - (SDLTriggerSource *)triggerSource {
     NSObject *obj = [parameters objectForKey:NAMES_triggerSource];
-    if ([obj isKindOfClass:SDLTriggerSource.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLTriggerSource.class]) {
         return (SDLTriggerSource *)obj;
     } else {
         return [SDLTriggerSource valueOf:(NSString *)obj];
diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/SDLOnDriverDistraction.m b/SmartDeviceLink-iOS/SmartDeviceLink/SDLOnDriverDistraction.m
index 56005c72e..1a87075b3 100644
--- a/SmartDeviceLink-iOS/SmartDeviceLink/SDLOnDriverDistraction.m
+++ b/SmartDeviceLink-iOS/SmartDeviceLink/SDLOnDriverDistraction.m
@@ -31,7 +31,7 @@
 
 - (SDLDriverDistractionState *)state {
     NSObject *obj = [parameters objectForKey:NAMES_state];
-    if ([obj isKindOfClass:SDLDriverDistractionState.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLDriverDistractionState.class]) {
         return (SDLDriverDistractionState *)obj;
     } else {
         return [SDLDriverDistractionState valueOf:(NSString *)obj];
diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/SDLOnHMIStatus.m b/SmartDeviceLink-iOS/SmartDeviceLink/SDLOnHMIStatus.m
index cb2407ed7..e3dc0d7fc 100644
--- a/SmartDeviceLink-iOS/SmartDeviceLink/SDLOnHMIStatus.m
+++ b/SmartDeviceLink-iOS/SmartDeviceLink/SDLOnHMIStatus.m
@@ -33,7 +33,7 @@
 
 - (SDLHMILevel *)hmiLevel {
     NSObject *obj = [parameters objectForKey:NAMES_hmiLevel];
-    if ([obj isKindOfClass:SDLHMILevel.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLHMILevel.class]) {
         return (SDLHMILevel *)obj;
     } else {
         return [SDLHMILevel valueOf:(NSString *)obj];
@@ -50,7 +50,7 @@
 
 - (SDLAudioStreamingState *)audioStreamingState {
     NSObject *obj = [parameters objectForKey:NAMES_audioStreamingState];
-    if ([obj isKindOfClass:SDLAudioStreamingState.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLAudioStreamingState.class]) {
         return (SDLAudioStreamingState *)obj;
     } else {
         return [SDLAudioStreamingState valueOf:(NSString *)obj];
@@ -67,7 +67,7 @@
 
 - (SDLSystemContext *)systemContext {
     NSObject *obj = [parameters objectForKey:NAMES_systemContext];
-    if ([obj isKindOfClass:SDLSystemContext.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLSystemContext.class]) {
         return (SDLSystemContext *)obj;
     } else {
         return [SDLSystemContext valueOf:(NSString *)obj];
diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/SDLOnKeyboardInput.m b/SmartDeviceLink-iOS/SmartDeviceLink/SDLOnKeyboardInput.m
index 5e5115c32..a70a7d06c 100644
--- a/SmartDeviceLink-iOS/SmartDeviceLink/SDLOnKeyboardInput.m
+++ b/SmartDeviceLink-iOS/SmartDeviceLink/SDLOnKeyboardInput.m
@@ -31,7 +31,7 @@
 
 - (SDLKeyboardEvent *)event {
     NSObject *obj = [parameters objectForKey:NAMES_event];
-    if ([obj isKindOfClass:SDLKeyboardEvent.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLKeyboardEvent.class]) {
         return (SDLKeyboardEvent *)obj;
     } else {
         return [SDLKeyboardEvent valueOf:(NSString *)obj];
diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/SDLOnLanguageChange.m b/SmartDeviceLink-iOS/SmartDeviceLink/SDLOnLanguageChange.m
index bb58b4c2f..216d0c4a5 100644
--- a/SmartDeviceLink-iOS/SmartDeviceLink/SDLOnLanguageChange.m
+++ b/SmartDeviceLink-iOS/SmartDeviceLink/SDLOnLanguageChange.m
@@ -31,7 +31,7 @@
 
 - (SDLLanguage *)language {
     NSObject *obj = [parameters objectForKey:NAMES_language];
-    if ([obj isKindOfClass:SDLLanguage.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLLanguage.class]) {
         return (SDLLanguage *)obj;
     } else {
         return [SDLLanguage valueOf:(NSString *)obj];
@@ -48,7 +48,7 @@
 
 - (SDLLanguage *)hmiDisplayLanguage {
     NSObject *obj = [parameters objectForKey:NAMES_hmiDisplayLanguage];
-    if ([obj isKindOfClass:SDLLanguage.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLLanguage.class]) {
         return (SDLLanguage *)obj;
     } else {
         return [SDLLanguage valueOf:(NSString *)obj];
diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/SDLOnLockScreenStatus.m b/SmartDeviceLink-iOS/SmartDeviceLink/SDLOnLockScreenStatus.m
index 6c228fb1b..fc9e39c00 100644
--- a/SmartDeviceLink-iOS/SmartDeviceLink/SDLOnLockScreenStatus.m
+++ b/SmartDeviceLink-iOS/SmartDeviceLink/SDLOnLockScreenStatus.m
@@ -33,7 +33,7 @@
 
 - (SDLLockScreenStatus *)lockScreenStatus {
     NSObject *obj = [parameters objectForKey:@"OnLockScreenStatus"];
-    if ([obj isKindOfClass:SDLLockScreenStatus.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLLockScreenStatus.class]) {
         return (SDLLockScreenStatus *)obj;
     } else {
         return [SDLLockScreenStatus valueOf:(NSString *)obj];
@@ -50,7 +50,7 @@
 
 - (SDLHMILevel *)hmiLevel {
     NSObject *obj = [parameters objectForKey:@"hmilevel"];
-    if ([obj isKindOfClass:SDLHMILevel.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLHMILevel.class]) {
         return (SDLHMILevel *)obj;
     } else {
         return [SDLHMILevel valueOf:(NSString *)obj];
diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/SDLOnSystemRequest.m b/SmartDeviceLink-iOS/SmartDeviceLink/SDLOnSystemRequest.m
index 63cb35867..c5aff7569 100644
--- a/SmartDeviceLink-iOS/SmartDeviceLink/SDLOnSystemRequest.m
+++ b/SmartDeviceLink-iOS/SmartDeviceLink/SDLOnSystemRequest.m
@@ -32,7 +32,7 @@
 
 - (SDLRequestType *)requestType {
     NSObject *obj = [parameters objectForKey:NAMES_requestType];
-    if ([obj isKindOfClass:SDLRequestType.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLRequestType.class]) {
         return (SDLRequestType *)obj;
     } else {
         return [SDLRequestType valueOf:(NSString *)obj];
@@ -73,7 +73,7 @@
 
 - (SDLFileType *)fileType {
     NSObject *obj = [parameters objectForKey:NAMES_fileType];
-    if ([obj isKindOfClass:SDLFileType.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLFileType.class]) {
         return (SDLFileType *)obj;
     } else {
         return [SDLFileType valueOf:(NSString *)obj];
diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/SDLOnTBTClientState.m b/SmartDeviceLink-iOS/SmartDeviceLink/SDLOnTBTClientState.m
index ac9ad9a31..ee0dc1efc 100644
--- a/SmartDeviceLink-iOS/SmartDeviceLink/SDLOnTBTClientState.m
+++ b/SmartDeviceLink-iOS/SmartDeviceLink/SDLOnTBTClientState.m
@@ -31,7 +31,7 @@
 
 - (SDLTBTState *)state {
     NSObject *obj = [parameters objectForKey:NAMES_state];
-    if ([obj isKindOfClass:SDLTBTState.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLTBTState.class]) {
         return (SDLTBTState *)obj;
     } else {
         return [SDLTBTState valueOf:(NSString *)obj];
diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/SDLOnTouchEvent.m b/SmartDeviceLink-iOS/SmartDeviceLink/SDLOnTouchEvent.m
index 33f051134..e73c79603 100644
--- a/SmartDeviceLink-iOS/SmartDeviceLink/SDLOnTouchEvent.m
+++ b/SmartDeviceLink-iOS/SmartDeviceLink/SDLOnTouchEvent.m
@@ -32,7 +32,7 @@
 
 - (SDLTouchType *)type {
     NSObject *obj = [parameters objectForKey:NAMES_type];
-    if ([obj isKindOfClass:SDLTouchType.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLTouchType.class]) {
         return (SDLTouchType *)obj;
     } else {
         return [SDLTouchType valueOf:(NSString *)obj];
diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/SDLOnVehicleData.m b/SmartDeviceLink-iOS/SmartDeviceLink/SDLOnVehicleData.m
index 838a730f1..3386ca450 100644
--- a/SmartDeviceLink-iOS/SmartDeviceLink/SDLOnVehicleData.m
+++ b/SmartDeviceLink-iOS/SmartDeviceLink/SDLOnVehicleData.m
@@ -45,7 +45,7 @@
 
 - (SDLGPSData *)gps {
     NSObject *obj = [parameters objectForKey:NAMES_gps];
-    if ([obj isKindOfClass:SDLGPSData.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLGPSData.class]) {
         return (SDLGPSData *)obj;
     } else {
         return [[SDLGPSData alloc] initWithDictionary:(NSMutableDictionary *)obj];
@@ -98,7 +98,7 @@
 
 - (SDLComponentVolumeStatus *)fuelLevel_State {
     NSObject *obj = [parameters objectForKey:NAMES_fuelLevel_State];
-    if ([obj isKindOfClass:SDLComponentVolumeStatus.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLComponentVolumeStatus.class]) {
         return (SDLComponentVolumeStatus *)obj;
     } else {
         return [SDLComponentVolumeStatus valueOf:(NSString *)obj];
@@ -151,7 +151,7 @@
 
 - (SDLPRNDL *)prndl {
     NSObject *obj = [parameters objectForKey:NAMES_prndl];
-    if ([obj isKindOfClass:SDLPRNDL.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLPRNDL.class]) {
         return (SDLPRNDL *)obj;
     } else {
         return [SDLPRNDL valueOf:(NSString *)obj];
@@ -168,7 +168,7 @@
 
 - (SDLTireStatus *)tirePressure {
     NSObject *obj = [parameters objectForKey:NAMES_tirePressure];
-    if ([obj isKindOfClass:SDLTireStatus.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLTireStatus.class]) {
         return (SDLTireStatus *)obj;
     } else {
         return [[SDLTireStatus alloc] initWithDictionary:(NSMutableDictionary *)obj];
@@ -197,7 +197,7 @@
 
 - (SDLBeltStatus *)beltStatus {
     NSObject *obj = [parameters objectForKey:NAMES_beltStatus];
-    if ([obj isKindOfClass:SDLBeltStatus.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLBeltStatus.class]) {
         return (SDLBeltStatus *)obj;
     } else {
         return [[SDLBeltStatus alloc] initWithDictionary:(NSMutableDictionary *)obj];
@@ -214,7 +214,7 @@
 
 - (SDLBodyInformation *)bodyInformation {
     NSObject *obj = [parameters objectForKey:NAMES_bodyInformation];
-    if ([obj isKindOfClass:SDLBodyInformation.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLBodyInformation.class]) {
         return (SDLBodyInformation *)obj;
     } else {
         return [[SDLBodyInformation alloc] initWithDictionary:(NSMutableDictionary *)obj];
@@ -231,7 +231,7 @@
 
 - (SDLDeviceStatus *)deviceStatus {
     NSObject *obj = [parameters objectForKey:NAMES_deviceStatus];
-    if ([obj isKindOfClass:SDLDeviceStatus.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLDeviceStatus.class]) {
         return (SDLDeviceStatus *)obj;
     } else {
         return [[SDLDeviceStatus alloc] initWithDictionary:(NSMutableDictionary *)obj];
@@ -248,7 +248,7 @@
 
 - (SDLVehicleDataEventStatus *)driverBraking {
     NSObject *obj = [parameters objectForKey:NAMES_driverBraking];
-    if ([obj isKindOfClass:SDLVehicleDataEventStatus.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLVehicleDataEventStatus.class]) {
         return (SDLVehicleDataEventStatus *)obj;
     } else {
         return [SDLVehicleDataEventStatus valueOf:(NSString *)obj];
@@ -265,7 +265,7 @@
 
 - (SDLWiperStatus *)wiperStatus {
     NSObject *obj = [parameters objectForKey:NAMES_wiperStatus];
-    if ([obj isKindOfClass:SDLWiperStatus.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLWiperStatus.class]) {
         return (SDLWiperStatus *)obj;
     } else {
         return [SDLWiperStatus valueOf:(NSString *)obj];
@@ -282,7 +282,7 @@
 
 - (SDLHeadLampStatus *)headLampStatus {
     NSObject *obj = [parameters objectForKey:NAMES_headLampStatus];
-    if ([obj isKindOfClass:SDLHeadLampStatus.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLHeadLampStatus.class]) {
         return (SDLHeadLampStatus *)obj;
     } else {
         return [[SDLHeadLampStatus alloc] initWithDictionary:(NSMutableDictionary *)obj];
@@ -335,7 +335,7 @@
 
 - (SDLECallInfo *)eCallInfo {
     NSObject *obj = [parameters objectForKey:NAMES_eCallInfo];
-    if ([obj isKindOfClass:SDLECallInfo.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLECallInfo.class]) {
         return (SDLECallInfo *)obj;
     } else {
         return [[SDLECallInfo alloc] initWithDictionary:(NSMutableDictionary *)obj];
@@ -352,7 +352,7 @@
 
 - (SDLAirbagStatus *)airbagStatus {
     NSObject *obj = [parameters objectForKey:NAMES_airbagStatus];
-    if ([obj isKindOfClass:SDLAirbagStatus.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLAirbagStatus.class]) {
         return (SDLAirbagStatus *)obj;
     } else {
         return [[SDLAirbagStatus alloc] initWithDictionary:(NSMutableDictionary *)obj];
@@ -369,7 +369,7 @@
 
 - (SDLEmergencyEvent *)emergencyEvent {
     NSObject *obj = [parameters objectForKey:NAMES_emergencyEvent];
-    if ([obj isKindOfClass:SDLEmergencyEvent.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLEmergencyEvent.class]) {
         return (SDLEmergencyEvent *)obj;
     } else {
         return [[SDLEmergencyEvent alloc] initWithDictionary:(NSMutableDictionary *)obj];
@@ -386,7 +386,7 @@
 
 - (SDLClusterModeStatus *)clusterModeStatus {
     NSObject *obj = [parameters objectForKey:NAMES_clusterModeStatus];
-    if ([obj isKindOfClass:SDLClusterModeStatus.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLClusterModeStatus.class]) {
         return (SDLClusterModeStatus *)obj;
     } else {
         return [[SDLClusterModeStatus alloc] initWithDictionary:(NSMutableDictionary *)obj];
@@ -403,7 +403,7 @@
 
 - (SDLMyKey *)myKey {
     NSObject *obj = [parameters objectForKey:NAMES_myKey];
-    if ([obj isKindOfClass:SDLMyKey.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLMyKey.class]) {
         return (SDLMyKey *)obj;
     } else {
         return [[SDLMyKey alloc] initWithDictionary:(NSMutableDictionary *)obj];
diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/SDLPerformAudioPassThru.m b/SmartDeviceLink-iOS/SmartDeviceLink/SDLPerformAudioPassThru.m
index 4caf5f6ee..67b0f05c3 100644
--- a/SmartDeviceLink-iOS/SmartDeviceLink/SDLPerformAudioPassThru.m
+++ b/SmartDeviceLink-iOS/SmartDeviceLink/SDLPerformAudioPassThru.m
@@ -80,7 +80,7 @@
 
 - (SDLSamplingRate *)samplingRate {
     NSObject *obj = [parameters objectForKey:NAMES_samplingRate];
-    if ([obj isKindOfClass:SDLSamplingRate.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLSamplingRate.class]) {
         return (SDLSamplingRate *)obj;
     } else {
         return [SDLSamplingRate valueOf:(NSString *)obj];
@@ -109,7 +109,7 @@
 
 - (SDLBitsPerSample *)bitsPerSample {
     NSObject *obj = [parameters objectForKey:NAMES_bitsPerSample];
-    if ([obj isKindOfClass:SDLBitsPerSample.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLBitsPerSample.class]) {
         return (SDLBitsPerSample *)obj;
     } else {
         return [SDLBitsPerSample valueOf:(NSString *)obj];
@@ -126,7 +126,7 @@
 
 - (SDLAudioType *)audioType {
     NSObject *obj = [parameters objectForKey:NAMES_audioType];
-    if ([obj isKindOfClass:SDLAudioType.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLAudioType.class]) {
         return (SDLAudioType *)obj;
     } else {
         return [SDLAudioType valueOf:(NSString *)obj];
diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/SDLPerformInteraction.m b/SmartDeviceLink-iOS/SmartDeviceLink/SDLPerformInteraction.m
index 5824794b0..f5eec2fa9 100644
--- a/SmartDeviceLink-iOS/SmartDeviceLink/SDLPerformInteraction.m
+++ b/SmartDeviceLink-iOS/SmartDeviceLink/SDLPerformInteraction.m
@@ -67,7 +67,7 @@
 
 - (SDLInteractionMode *)interactionMode {
     NSObject *obj = [parameters objectForKey:NAMES_interactionMode];
-    if ([obj isKindOfClass:SDLInteractionMode.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLInteractionMode.class]) {
         return (SDLInteractionMode *)obj;
     } else {
         return [SDLInteractionMode valueOf:(NSString *)obj];
@@ -171,7 +171,7 @@
 
 - (SDLLayoutMode *)interactionLayout {
     NSObject *obj = [parameters objectForKey:NAMES_interactionLayout];
-    if ([obj isKindOfClass:SDLLayoutMode.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLLayoutMode.class]) {
         return (SDLLayoutMode *)obj;
     } else {
         return [SDLLayoutMode valueOf:(NSString *)obj];
diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/SDLPerformInteractionResponse.m b/SmartDeviceLink-iOS/SmartDeviceLink/SDLPerformInteractionResponse.m
index bdd4254b5..ae1c5e14c 100644
--- a/SmartDeviceLink-iOS/SmartDeviceLink/SDLPerformInteractionResponse.m
+++ b/SmartDeviceLink-iOS/SmartDeviceLink/SDLPerformInteractionResponse.m
@@ -56,7 +56,7 @@
 
 - (SDLTriggerSource *)triggerSource {
     NSObject *obj = [parameters objectForKey:NAMES_triggerSource];
-    if ([obj isKindOfClass:SDLTriggerSource.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLTriggerSource.class]) {
         return (SDLTriggerSource *)obj;
     } else {
         return [SDLTriggerSource valueOf:(NSString *)obj];
diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/SDLPermissionItem.m b/SmartDeviceLink-iOS/SmartDeviceLink/SDLPermissionItem.m
index 9ce9a64b9..560094c2e 100644
--- a/SmartDeviceLink-iOS/SmartDeviceLink/SDLPermissionItem.m
+++ b/SmartDeviceLink-iOS/SmartDeviceLink/SDLPermissionItem.m
@@ -44,7 +44,7 @@
 
 - (SDLHMIPermissions *)hmiPermissions {
     NSObject *obj = [store objectForKey:NAMES_hmiPermissions];
-    if ([obj isKindOfClass:SDLHMIPermissions.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLHMIPermissions.class]) {
         return (SDLHMIPermissions *)obj;
     } else {
         return [[SDLHMIPermissions alloc] initWithDictionary:(NSMutableDictionary *)obj];
@@ -61,7 +61,7 @@
 
 - (SDLParameterPermissions *)parameterPermissions {
     NSObject *obj = [store objectForKey:NAMES_parameterPermissions];
-    if ([obj isKindOfClass:SDLParameterPermissions.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLParameterPermissions.class]) {
         return (SDLParameterPermissions *)obj;
     } else {
         return [[SDLParameterPermissions alloc] initWithDictionary:(NSMutableDictionary *)obj];
diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/SDLPutFile.m b/SmartDeviceLink-iOS/SmartDeviceLink/SDLPutFile.m
index 37547fd3c..69d83edcd 100644
--- a/SmartDeviceLink-iOS/SmartDeviceLink/SDLPutFile.m
+++ b/SmartDeviceLink-iOS/SmartDeviceLink/SDLPutFile.m
@@ -43,7 +43,7 @@
 
 - (SDLFileType *)fileType {
     NSObject *obj = [parameters objectForKey:NAMES_fileType];
-    if ([obj isKindOfClass:SDLFileType.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLFileType.class]) {
         return (SDLFileType *)obj;
     } else {
         return [SDLFileType valueOf:(NSString *)obj];
diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/SDLRPCResponse.m b/SmartDeviceLink-iOS/SmartDeviceLink/SDLRPCResponse.m
index 573521237..606781070 100644
--- a/SmartDeviceLink-iOS/SmartDeviceLink/SDLRPCResponse.m
+++ b/SmartDeviceLink-iOS/SmartDeviceLink/SDLRPCResponse.m
@@ -67,7 +67,7 @@
 
 - (SDLResult *)resultCode {
     NSObject *obj = [parameters objectForKey:NAMES_resultCode];
-    if ([obj isKindOfClass:SDLResult.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLResult.class]) {
         return (SDLResult *)obj;
     } else {
         return [SDLResult valueOf:(NSString *)obj];
diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/SDLRegisterAppInterface.m b/SmartDeviceLink-iOS/SmartDeviceLink/SDLRegisterAppInterface.m
index ee4fead1c..b10917f94 100644
--- a/SmartDeviceLink-iOS/SmartDeviceLink/SDLRegisterAppInterface.m
+++ b/SmartDeviceLink-iOS/SmartDeviceLink/SDLRegisterAppInterface.m
@@ -36,7 +36,7 @@
 
 - (SDLSyncMsgVersion *)syncMsgVersion {
     NSObject *obj = [parameters objectForKey:NAMES_syncMsgVersion];
-    if ([obj isKindOfClass:SDLSyncMsgVersion.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLSyncMsgVersion.class]) {
         return (SDLSyncMsgVersion *)obj;
     } else {
         return [[SDLSyncMsgVersion alloc] initWithDictionary:(NSMutableDictionary *)obj];
@@ -122,7 +122,7 @@
 
 - (SDLLanguage *)languageDesired {
     NSObject *obj = [parameters objectForKey:NAMES_languageDesired];
-    if ([obj isKindOfClass:SDLLanguage.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLLanguage.class]) {
         return (SDLLanguage *)obj;
     } else {
         return [SDLLanguage valueOf:(NSString *)obj];
@@ -139,7 +139,7 @@
 
 - (SDLLanguage *)hmiDisplayLanguageDesired {
     NSObject *obj = [parameters objectForKey:NAMES_hmiDisplayLanguageDesired];
-    if ([obj isKindOfClass:SDLLanguage.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLLanguage.class]) {
         return (SDLLanguage *)obj;
     } else {
         return [SDLLanguage valueOf:(NSString *)obj];
@@ -189,7 +189,7 @@
 
 - (SDLDeviceInfo *)deviceInfo {
     NSObject *obj = [parameters objectForKey:NAMES_deviceInfo];
-    if ([obj isKindOfClass:SDLDeviceInfo.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLDeviceInfo.class]) {
         return (SDLDeviceInfo *)obj;
     } else {
         return [[SDLDeviceInfo alloc] initWithDictionary:(NSMutableDictionary *)obj];
diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/SDLRegisterAppInterfaceResponse.m b/SmartDeviceLink-iOS/SmartDeviceLink/SDLRegisterAppInterfaceResponse.m
index 875d44e53..18356c34f 100644
--- a/SmartDeviceLink-iOS/SmartDeviceLink/SDLRegisterAppInterfaceResponse.m
+++ b/SmartDeviceLink-iOS/SmartDeviceLink/SDLRegisterAppInterfaceResponse.m
@@ -44,7 +44,7 @@
 
 - (SDLSyncMsgVersion *)syncMsgVersion {
     NSObject *obj = [parameters objectForKey:NAMES_syncMsgVersion];
-    if ([obj isKindOfClass:SDLSyncMsgVersion.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLSyncMsgVersion.class]) {
         return (SDLSyncMsgVersion *)obj;
     } else {
         return [[SDLSyncMsgVersion alloc] initWithDictionary:(NSMutableDictionary *)obj];
@@ -61,7 +61,7 @@
 
 - (SDLLanguage *)language {
     NSObject *obj = [parameters objectForKey:NAMES_language];
-    if ([obj isKindOfClass:SDLLanguage.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLLanguage.class]) {
         return (SDLLanguage *)obj;
     } else {
         return [SDLLanguage valueOf:(NSString *)obj];
@@ -78,7 +78,7 @@
 
 - (SDLLanguage *)hmiDisplayLanguage {
     NSObject *obj = [parameters objectForKey:NAMES_hmiDisplayLanguage];
-    if ([obj isKindOfClass:SDLLanguage.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLLanguage.class]) {
         return (SDLLanguage *)obj;
     } else {
         return [SDLLanguage valueOf:(NSString *)obj];
@@ -95,7 +95,7 @@
 
 - (SDLDisplayCapabilities *)displayCapabilities {
     NSObject *obj = [parameters objectForKey:NAMES_displayCapabilities];
-    if ([obj isKindOfClass:SDLDisplayCapabilities.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLDisplayCapabilities.class]) {
         return (SDLDisplayCapabilities *)obj;
     } else {
         return [[SDLDisplayCapabilities alloc] initWithDictionary:(NSMutableDictionary *)obj];
@@ -154,7 +154,7 @@
 
 - (SDLPresetBankCapabilities *)presetBankCapabilities {
     NSObject *obj = [parameters objectForKey:NAMES_presetBankCapabilities];
-    if ([obj isKindOfClass:SDLPresetBankCapabilities.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLPresetBankCapabilities.class]) {
         return (SDLPresetBankCapabilities *)obj;
     } else {
         return [[SDLPresetBankCapabilities alloc] initWithDictionary:(NSMutableDictionary *)obj];
@@ -276,7 +276,7 @@
 
 - (SDLVehicleType *)vehicleType {
     NSObject *obj = [parameters objectForKey:NAMES_vehicleType];
-    if ([obj isKindOfClass:SDLVehicleType.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLVehicleType.class]) {
         return (SDLVehicleType *)obj;
     } else {
         return [[SDLVehicleType alloc] initWithDictionary:(NSMutableDictionary *)obj];
@@ -305,7 +305,7 @@
 
 - (SDLHMICapabilities *)hmiCapabilities {
     NSObject *obj = [parameters objectForKey:NAMES_hmiCapabilities];
-    if ([obj isKindOfClass:[SDLHMICapabilities class]]) {
+    if (obj == nil || [obj isKindOfClass:[SDLHMICapabilities class]]) {
         return (SDLHMICapabilities *)obj;
     } else {
         return [[SDLHMICapabilities alloc] initWithDictionary:(NSMutableDictionary *)obj];
diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/SDLScreenParams.m b/SmartDeviceLink-iOS/SmartDeviceLink/SDLScreenParams.m
index 3e3668cf5..1debff302 100644
--- a/SmartDeviceLink-iOS/SmartDeviceLink/SDLScreenParams.m
+++ b/SmartDeviceLink-iOS/SmartDeviceLink/SDLScreenParams.m
@@ -32,7 +32,7 @@
 
 - (SDLImageResolution *)resolution {
     NSObject *obj = [store objectForKey:NAMES_resolution];
-    if ([obj isKindOfClass:SDLImageResolution.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLImageResolution.class]) {
         return (SDLImageResolution *)obj;
     } else {
         return [[SDLImageResolution alloc] initWithDictionary:(NSMutableDictionary *)obj];
@@ -49,7 +49,7 @@
 
 - (SDLTouchEventCapabilities *)touchEventAvailable {
     NSObject *obj = [store objectForKey:NAMES_touchEventAvailable];
-    if ([obj isKindOfClass:SDLTouchEventCapabilities.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLTouchEventCapabilities.class]) {
         return (SDLTouchEventCapabilities *)obj;
     } else {
         return [[SDLTouchEventCapabilities alloc] initWithDictionary:(NSMutableDictionary *)obj];
diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/SDLSendLocation.m b/SmartDeviceLink-iOS/SmartDeviceLink/SDLSendLocation.m
index 518193f23..cbf9d6cd3 100644
--- a/SmartDeviceLink-iOS/SmartDeviceLink/SDLSendLocation.m
+++ b/SmartDeviceLink-iOS/SmartDeviceLink/SDLSendLocation.m
@@ -97,7 +97,7 @@
 
 - (SDLImage *)locationImage {
     id obj = parameters[NAMES_locationImage];
-    if ([obj isKindOfClass:[SDLImage class]]) {
+    if (obj == nil || [obj isKindOfClass:[SDLImage class]]) {
         return (SDLImage *)obj;
     } else {
         return [[SDLImage alloc] initWithDictionary:obj];
diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/SDLSetDisplayLayoutResponse.m b/SmartDeviceLink-iOS/SmartDeviceLink/SDLSetDisplayLayoutResponse.m
index 9be1074c7..fde37062e 100644
--- a/SmartDeviceLink-iOS/SmartDeviceLink/SDLSetDisplayLayoutResponse.m
+++ b/SmartDeviceLink-iOS/SmartDeviceLink/SDLSetDisplayLayoutResponse.m
@@ -35,7 +35,7 @@
 
 - (SDLDisplayCapabilities *)displayCapabilities {
     NSObject *obj = [parameters objectForKey:NAMES_displayCapabilities];
-    if ([obj isKindOfClass:SDLDisplayCapabilities.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLDisplayCapabilities.class]) {
         return (SDLDisplayCapabilities *)obj;
     } else {
         return [[SDLDisplayCapabilities alloc] initWithDictionary:(NSMutableDictionary *)obj];
@@ -94,7 +94,7 @@
 
 - (SDLPresetBankCapabilities *)presetBankCapabilities {
     NSObject *obj = [parameters objectForKey:NAMES_presetBankCapabilities];
-    if ([obj isKindOfClass:SDLPresetBankCapabilities.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLPresetBankCapabilities.class]) {
         return (SDLPresetBankCapabilities *)obj;
     } else {
         return [[SDLPresetBankCapabilities alloc] initWithDictionary:(NSMutableDictionary *)obj];
diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/SDLSetGlobalProperties.m b/SmartDeviceLink-iOS/SmartDeviceLink/SDLSetGlobalProperties.m
index 305adaeb3..ba9749e3e 100644
--- a/SmartDeviceLink-iOS/SmartDeviceLink/SDLSetGlobalProperties.m
+++ b/SmartDeviceLink-iOS/SmartDeviceLink/SDLSetGlobalProperties.m
@@ -122,7 +122,7 @@
 
 - (SDLImage *)menuIcon {
     NSObject *obj = [parameters objectForKey:NAMES_menuIcon];
-    if ([obj isKindOfClass:SDLImage.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLImage.class]) {
         return (SDLImage *)obj;
     } else {
         return [[SDLImage alloc] initWithDictionary:(NSMutableDictionary *)obj];
@@ -139,7 +139,7 @@
 
 - (SDLKeyboardProperties *)keyboardProperties {
     NSObject *obj = [parameters objectForKey:NAMES_keyboardProperties];
-    if ([obj isKindOfClass:SDLKeyboardProperties.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLKeyboardProperties.class]) {
         return (SDLKeyboardProperties *)obj;
     } else {
         return [[SDLKeyboardProperties alloc] initWithDictionary:(NSMutableDictionary *)obj];
diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/SDLSetMediaClockTimer.m b/SmartDeviceLink-iOS/SmartDeviceLink/SDLSetMediaClockTimer.m
index 40d31f50f..325d0e347 100644
--- a/SmartDeviceLink-iOS/SmartDeviceLink/SDLSetMediaClockTimer.m
+++ b/SmartDeviceLink-iOS/SmartDeviceLink/SDLSetMediaClockTimer.m
@@ -33,7 +33,7 @@
 
 - (SDLStartTime *)startTime {
     NSObject *obj = [parameters objectForKey:NAMES_startTime];
-    if ([obj isKindOfClass:SDLStartTime.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLStartTime.class]) {
         return (SDLStartTime *)obj;
     } else {
         return [[SDLStartTime alloc] initWithDictionary:(NSMutableDictionary *)obj];
@@ -50,7 +50,7 @@
 
 - (SDLStartTime *)endTime {
     NSObject *obj = [parameters objectForKey:NAMES_endTime];
-    if ([obj isKindOfClass:SDLStartTime.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLStartTime.class]) {
         return (SDLStartTime *)obj;
     } else {
         return [[SDLStartTime alloc] initWithDictionary:(NSMutableDictionary *)obj];
@@ -67,7 +67,7 @@
 
 - (SDLUpdateMode *)updateMode {
     NSObject *obj = [parameters objectForKey:NAMES_updateMode];
-    if ([obj isKindOfClass:SDLUpdateMode.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLUpdateMode.class]) {
         return (SDLUpdateMode *)obj;
     } else {
         return [SDLUpdateMode valueOf:(NSString *)obj];
diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/SDLShow.m b/SmartDeviceLink-iOS/SmartDeviceLink/SDLShow.m
index 948604dae..933167159 100644
--- a/SmartDeviceLink-iOS/SmartDeviceLink/SDLShow.m
+++ b/SmartDeviceLink-iOS/SmartDeviceLink/SDLShow.m
@@ -82,7 +82,7 @@
 
 - (SDLTextAlignment *)alignment {
     NSObject *obj = [parameters objectForKey:NAMES_alignment];
-    if ([obj isKindOfClass:SDLTextAlignment.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLTextAlignment.class]) {
         return (SDLTextAlignment *)obj;
     } else {
         return [SDLTextAlignment valueOf:(NSString *)obj];
@@ -135,7 +135,7 @@
 
 - (SDLImage *)graphic {
     NSObject *obj = [parameters objectForKey:NAMES_graphic];
-    if ([obj isKindOfClass:SDLImage.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLImage.class]) {
         return (SDLImage *)obj;
     } else {
         return [[SDLImage alloc] initWithDictionary:(NSMutableDictionary *)obj];
@@ -152,7 +152,7 @@
 
 - (SDLImage *)secondaryGraphic {
     NSObject *obj = [parameters objectForKey:NAMES_secondaryGraphic];
-    if ([obj isKindOfClass:SDLImage.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLImage.class]) {
         return (SDLImage *)obj;
     } else {
         return [[SDLImage alloc] initWithDictionary:(NSMutableDictionary *)obj];
diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/SDLShowConstantTBT.m b/SmartDeviceLink-iOS/SmartDeviceLink/SDLShowConstantTBT.m
index 9a1f3ee46..c3f87f071 100644
--- a/SmartDeviceLink-iOS/SmartDeviceLink/SDLShowConstantTBT.m
+++ b/SmartDeviceLink-iOS/SmartDeviceLink/SDLShowConstantTBT.m
@@ -93,7 +93,7 @@
 
 - (SDLImage *)turnIcon {
     NSObject *obj = [parameters objectForKey:NAMES_turnIcon];
-    if ([obj isKindOfClass:SDLImage.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLImage.class]) {
         return (SDLImage *)obj;
     } else {
         return [[SDLImage alloc] initWithDictionary:(NSMutableDictionary *)obj];
@@ -110,7 +110,7 @@
 
 - (SDLImage *)nextTurnIcon {
     NSObject *obj = [parameters objectForKey:NAMES_nextTurnIcon];
-    if ([obj isKindOfClass:SDLImage.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLImage.class]) {
         return (SDLImage *)obj;
     } else {
         return [[SDLImage alloc] initWithDictionary:(NSMutableDictionary *)obj];
diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/SDLSingleTireStatus.m b/SmartDeviceLink-iOS/SmartDeviceLink/SDLSingleTireStatus.m
index 79a977e05..87826f32b 100644
--- a/SmartDeviceLink-iOS/SmartDeviceLink/SDLSingleTireStatus.m
+++ b/SmartDeviceLink-iOS/SmartDeviceLink/SDLSingleTireStatus.m
@@ -31,7 +31,7 @@
 
 - (SDLComponentVolumeStatus *)status {
     NSObject *obj = [store objectForKey:NAMES_status];
-    if ([obj isKindOfClass:SDLComponentVolumeStatus.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLComponentVolumeStatus.class]) {
         return (SDLComponentVolumeStatus *)obj;
     } else {
         return [SDLComponentVolumeStatus valueOf:(NSString *)obj];
diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/SDLSoftButton.m b/SmartDeviceLink-iOS/SmartDeviceLink/SDLSoftButton.m
index e72f91d7c..a93ce510c 100644
--- a/SmartDeviceLink-iOS/SmartDeviceLink/SDLSoftButton.m
+++ b/SmartDeviceLink-iOS/SmartDeviceLink/SDLSoftButton.m
@@ -33,7 +33,7 @@
 
 - (SDLSoftButtonType *)type {
     NSObject *obj = [store objectForKey:NAMES_type];
-    if ([obj isKindOfClass:SDLSoftButtonType.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLSoftButtonType.class]) {
         return (SDLSoftButtonType *)obj;
     } else {
         return [SDLSoftButtonType valueOf:(NSString *)obj];
@@ -62,7 +62,7 @@
 
 - (SDLImage *)image {
     NSObject *obj = [store objectForKey:NAMES_image];
-    if ([obj isKindOfClass:SDLImage.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLImage.class]) {
         return (SDLImage *)obj;
     } else {
         return [[SDLImage alloc] initWithDictionary:(NSMutableDictionary *)obj];
@@ -103,7 +103,7 @@
 
 - (SDLSystemAction *)systemAction {
     NSObject *obj = [store objectForKey:NAMES_systemAction];
-    if ([obj isKindOfClass:SDLSystemAction.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLSystemAction.class]) {
         return (SDLSystemAction *)obj;
     } else {
         return [SDLSystemAction valueOf:(NSString *)obj];
diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/SDLSubscribeButton.m b/SmartDeviceLink-iOS/SmartDeviceLink/SDLSubscribeButton.m
index cbf56af4d..58a28a797 100644
--- a/SmartDeviceLink-iOS/SmartDeviceLink/SDLSubscribeButton.m
+++ b/SmartDeviceLink-iOS/SmartDeviceLink/SDLSubscribeButton.m
@@ -32,7 +32,7 @@
 
 - (SDLButtonName *)buttonName {
     NSObject *obj = [parameters objectForKey:NAMES_buttonName];
-    if ([obj isKindOfClass:SDLButtonName.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLButtonName.class]) {
         return (SDLButtonName *)obj;
     } else {
         return [SDLButtonName valueOf:(NSString *)obj];
diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/SDLSubscribeVehicleDataResponse.m b/SmartDeviceLink-iOS/SmartDeviceLink/SDLSubscribeVehicleDataResponse.m
index a7ca64198..5afa5f1be 100644
--- a/SmartDeviceLink-iOS/SmartDeviceLink/SDLSubscribeVehicleDataResponse.m
+++ b/SmartDeviceLink-iOS/SmartDeviceLink/SDLSubscribeVehicleDataResponse.m
@@ -32,7 +32,7 @@
 
 - (SDLVehicleDataResult *)gps {
     NSObject *obj = [parameters objectForKey:NAMES_gps];
-    if ([obj isKindOfClass:SDLVehicleDataResult.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) {
         return (SDLVehicleDataResult *)obj;
     } else {
         return [[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary *)obj];
@@ -49,7 +49,7 @@
 
 - (SDLVehicleDataResult *)speed {
     NSObject *obj = [parameters objectForKey:NAMES_speed];
-    if ([obj isKindOfClass:SDLVehicleDataResult.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) {
         return (SDLVehicleDataResult *)obj;
     } else {
         return [[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary *)obj];
@@ -66,7 +66,7 @@
 
 - (SDLVehicleDataResult *)rpm {
     NSObject *obj = [parameters objectForKey:NAMES_rpm];
-    if ([obj isKindOfClass:SDLVehicleDataResult.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) {
         return (SDLVehicleDataResult *)obj;
     } else {
         return [[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary *)obj];
@@ -83,7 +83,7 @@
 
 - (SDLVehicleDataResult *)fuelLevel {
     NSObject *obj = [parameters objectForKey:NAMES_fuelLevel];
-    if ([obj isKindOfClass:SDLVehicleDataResult.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) {
         return (SDLVehicleDataResult *)obj;
     } else {
         return [[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary *)obj];
@@ -100,7 +100,7 @@
 
 - (SDLVehicleDataResult *)fuelLevel_State {
     NSObject *obj = [parameters objectForKey:NAMES_fuelLevel_State];
-    if ([obj isKindOfClass:SDLVehicleDataResult.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) {
         return (SDLVehicleDataResult *)obj;
     } else {
         return [[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary *)obj];
@@ -117,7 +117,7 @@
 
 - (SDLVehicleDataResult *)instantFuelConsumption {
     NSObject *obj = [parameters objectForKey:NAMES_instantFuelConsumption];
-    if ([obj isKindOfClass:SDLVehicleDataResult.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) {
         return (SDLVehicleDataResult *)obj;
     } else {
         return [[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary *)obj];
@@ -134,7 +134,7 @@
 
 - (SDLVehicleDataResult *)externalTemperature {
     NSObject *obj = [parameters objectForKey:NAMES_externalTemperature];
-    if ([obj isKindOfClass:SDLVehicleDataResult.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) {
         return (SDLVehicleDataResult *)obj;
     } else {
         return [[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary *)obj];
@@ -151,7 +151,7 @@
 
 - (SDLVehicleDataResult *)prndl {
     NSObject *obj = [parameters objectForKey:NAMES_prndl];
-    if ([obj isKindOfClass:SDLVehicleDataResult.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) {
         return (SDLVehicleDataResult *)obj;
     } else {
         return [[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary *)obj];
@@ -168,7 +168,7 @@
 
 - (SDLVehicleDataResult *)tirePressure {
     NSObject *obj = [parameters objectForKey:NAMES_tirePressure];
-    if ([obj isKindOfClass:SDLVehicleDataResult.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) {
         return (SDLVehicleDataResult *)obj;
     } else {
         return [[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary *)obj];
@@ -185,7 +185,7 @@
 
 - (SDLVehicleDataResult *)odometer {
     NSObject *obj = [parameters objectForKey:NAMES_odometer];
-    if ([obj isKindOfClass:SDLVehicleDataResult.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) {
         return (SDLVehicleDataResult *)obj;
     } else {
         return [[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary *)obj];
@@ -202,7 +202,7 @@
 
 - (SDLVehicleDataResult *)beltStatus {
     NSObject *obj = [parameters objectForKey:NAMES_beltStatus];
-    if ([obj isKindOfClass:SDLVehicleDataResult.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) {
         return (SDLVehicleDataResult *)obj;
     } else {
         return [[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary *)obj];
@@ -219,7 +219,7 @@
 
 - (SDLVehicleDataResult *)bodyInformation {
     NSObject *obj = [parameters objectForKey:NAMES_bodyInformation];
-    if ([obj isKindOfClass:SDLVehicleDataResult.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) {
         return (SDLVehicleDataResult *)obj;
     } else {
         return [[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary *)obj];
@@ -236,7 +236,7 @@
 
 - (SDLVehicleDataResult *)deviceStatus {
     NSObject *obj = [parameters objectForKey:NAMES_deviceStatus];
-    if ([obj isKindOfClass:SDLVehicleDataResult.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) {
         return (SDLVehicleDataResult *)obj;
     } else {
         return [[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary *)obj];
@@ -253,7 +253,7 @@
 
 - (SDLVehicleDataResult *)driverBraking {
     NSObject *obj = [parameters objectForKey:NAMES_driverBraking];
-    if ([obj isKindOfClass:SDLVehicleDataResult.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) {
         return (SDLVehicleDataResult *)obj;
     } else {
         return [[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary *)obj];
@@ -270,7 +270,7 @@
 
 - (SDLVehicleDataResult *)wiperStatus {
     NSObject *obj = [parameters objectForKey:NAMES_wiperStatus];
-    if ([obj isKindOfClass:SDLVehicleDataResult.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) {
         return (SDLVehicleDataResult *)obj;
     } else {
         return [[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary *)obj];
@@ -287,7 +287,7 @@
 
 - (SDLVehicleDataResult *)headLampStatus {
     NSObject *obj = [parameters objectForKey:NAMES_headLampStatus];
-    if ([obj isKindOfClass:SDLVehicleDataResult.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) {
         return (SDLVehicleDataResult *)obj;
     } else {
         return [[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary *)obj];
@@ -304,7 +304,7 @@
 
 - (SDLVehicleDataResult *)engineTorque {
     NSObject *obj = [parameters objectForKey:NAMES_engineTorque];
-    if ([obj isKindOfClass:SDLVehicleDataResult.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) {
         return (SDLVehicleDataResult *)obj;
     } else {
         return [[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary *)obj];
@@ -321,7 +321,7 @@
 
 - (SDLVehicleDataResult *)accPedalPosition {
     NSObject *obj = [parameters objectForKey:NAMES_accPedalPosition];
-    if ([obj isKindOfClass:SDLVehicleDataResult.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) {
         return (SDLVehicleDataResult *)obj;
     } else {
         return [[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary *)obj];
@@ -338,7 +338,7 @@
 
 - (SDLVehicleDataResult *)steeringWheelAngle {
     NSObject *obj = [parameters objectForKey:NAMES_steeringWheelAngle];
-    if ([obj isKindOfClass:SDLVehicleDataResult.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) {
         return (SDLVehicleDataResult *)obj;
     } else {
         return [[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary *)obj];
@@ -355,7 +355,7 @@
 
 - (SDLVehicleDataResult *)eCallInfo {
     NSObject *obj = [parameters objectForKey:NAMES_eCallInfo];
-    if ([obj isKindOfClass:SDLVehicleDataResult.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) {
         return (SDLVehicleDataResult *)obj;
     } else {
         return [[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary *)obj];
@@ -372,7 +372,7 @@
 
 - (SDLVehicleDataResult *)airbagStatus {
     NSObject *obj = [parameters objectForKey:NAMES_airbagStatus];
-    if ([obj isKindOfClass:SDLVehicleDataResult.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) {
         return (SDLVehicleDataResult *)obj;
     } else {
         return [[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary *)obj];
@@ -389,7 +389,7 @@
 
 - (SDLVehicleDataResult *)emergencyEvent {
     NSObject *obj = [parameters objectForKey:NAMES_emergencyEvent];
-    if ([obj isKindOfClass:SDLVehicleDataResult.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) {
         return (SDLVehicleDataResult *)obj;
     } else {
         return [[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary *)obj];
@@ -406,7 +406,7 @@
 
 - (SDLVehicleDataResult *)clusterModes {
     NSObject *obj = [parameters objectForKey:NAMES_clusterModes];
-    if ([obj isKindOfClass:SDLVehicleDataResult.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) {
         return (SDLVehicleDataResult *)obj;
     } else {
         return [[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary *)obj];
@@ -423,7 +423,7 @@
 
 - (SDLVehicleDataResult *)myKey {
     NSObject *obj = [parameters objectForKey:NAMES_myKey];
-    if ([obj isKindOfClass:SDLVehicleDataResult.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) {
         return (SDLVehicleDataResult *)obj;
     } else {
         return [[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary *)obj];
diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/SDLSystemRequest.m b/SmartDeviceLink-iOS/SmartDeviceLink/SDLSystemRequest.m
index 5fb7218b2..836b44447 100644
--- a/SmartDeviceLink-iOS/SmartDeviceLink/SDLSystemRequest.m
+++ b/SmartDeviceLink-iOS/SmartDeviceLink/SDLSystemRequest.m
@@ -32,7 +32,7 @@
 
 - (SDLRequestType *)requestType {
     NSObject *obj = [parameters objectForKey:NAMES_requestType];
-    if ([obj isKindOfClass:SDLRequestType.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLRequestType.class]) {
         return (SDLRequestType *)obj;
     } else {
         return [SDLRequestType valueOf:(NSString *)obj];
diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/SDLTTSChunk.m b/SmartDeviceLink-iOS/SmartDeviceLink/SDLTTSChunk.m
index da3844a76..7e45413eb 100644
--- a/SmartDeviceLink-iOS/SmartDeviceLink/SDLTTSChunk.m
+++ b/SmartDeviceLink-iOS/SmartDeviceLink/SDLTTSChunk.m
@@ -43,7 +43,7 @@
 
 - (SDLSpeechCapabilities *)type {
     NSObject *obj = [store objectForKey:NAMES_type];
-    if ([obj isKindOfClass:SDLSpeechCapabilities.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLSpeechCapabilities.class]) {
         return (SDLSpeechCapabilities *)obj;
     } else {
         return [SDLSpeechCapabilities valueOf:(NSString *)obj];
diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/SDLTextField.m b/SmartDeviceLink-iOS/SmartDeviceLink/SDLTextField.m
index 08261e573..926d258f1 100644
--- a/SmartDeviceLink-iOS/SmartDeviceLink/SDLTextField.m
+++ b/SmartDeviceLink-iOS/SmartDeviceLink/SDLTextField.m
@@ -32,7 +32,7 @@
 
 - (SDLTextFieldName *)name {
     NSObject *obj = [store objectForKey:NAMES_name];
-    if ([obj isKindOfClass:SDLTextFieldName.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLTextFieldName.class]) {
         return (SDLTextFieldName *)obj;
     } else {
         return [SDLTextFieldName valueOf:(NSString *)obj];
@@ -49,7 +49,7 @@
 
 - (SDLCharacterSet *)characterSet {
     NSObject *obj = [store objectForKey:NAMES_characterSet];
-    if ([obj isKindOfClass:SDLCharacterSet.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLCharacterSet.class]) {
         return (SDLCharacterSet *)obj;
     } else {
         return [SDLCharacterSet valueOf:(NSString *)obj];
diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/SDLTireStatus.m b/SmartDeviceLink-iOS/SmartDeviceLink/SDLTireStatus.m
index 146af79c9..c2768565a 100644
--- a/SmartDeviceLink-iOS/SmartDeviceLink/SDLTireStatus.m
+++ b/SmartDeviceLink-iOS/SmartDeviceLink/SDLTireStatus.m
@@ -32,7 +32,7 @@
 
 - (SDLWarningLightStatus *)pressureTelltale {
     NSObject *obj = [store objectForKey:NAMES_pressureTelltale];
-    if ([obj isKindOfClass:SDLWarningLightStatus.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLWarningLightStatus.class]) {
         return (SDLWarningLightStatus *)obj;
     } else {
         return [SDLWarningLightStatus valueOf:(NSString *)obj];
@@ -49,7 +49,7 @@
 
 - (SDLSingleTireStatus *)leftFront {
     NSObject *obj = [store objectForKey:NAMES_leftFront];
-    if ([obj isKindOfClass:SDLSingleTireStatus.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLSingleTireStatus.class]) {
         return (SDLSingleTireStatus *)obj;
     } else {
         return [[SDLSingleTireStatus alloc] initWithDictionary:(NSMutableDictionary *)obj];
@@ -66,7 +66,7 @@
 
 - (SDLSingleTireStatus *)rightFront {
     NSObject *obj = [store objectForKey:NAMES_rightFront];
-    if ([obj isKindOfClass:SDLSingleTireStatus.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLSingleTireStatus.class]) {
         return (SDLSingleTireStatus *)obj;
     } else {
         return [[SDLSingleTireStatus alloc] initWithDictionary:(NSMutableDictionary *)obj];
@@ -83,7 +83,7 @@
 
 - (SDLSingleTireStatus *)leftRear {
     NSObject *obj = [store objectForKey:NAMES_leftRear];
-    if ([obj isKindOfClass:SDLSingleTireStatus.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLSingleTireStatus.class]) {
         return (SDLSingleTireStatus *)obj;
     } else {
         return [[SDLSingleTireStatus alloc] initWithDictionary:(NSMutableDictionary *)obj];
@@ -100,7 +100,7 @@
 
 - (SDLSingleTireStatus *)rightRear {
     NSObject *obj = [store objectForKey:NAMES_rightRear];
-    if ([obj isKindOfClass:SDLSingleTireStatus.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLSingleTireStatus.class]) {
         return (SDLSingleTireStatus *)obj;
     } else {
         return [[SDLSingleTireStatus alloc] initWithDictionary:(NSMutableDictionary *)obj];
@@ -117,7 +117,7 @@
 
 - (SDLSingleTireStatus *)innerLeftRear {
     NSObject *obj = [store objectForKey:NAMES_innerLeftRear];
-    if ([obj isKindOfClass:SDLSingleTireStatus.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLSingleTireStatus.class]) {
         return (SDLSingleTireStatus *)obj;
     } else {
         return [[SDLSingleTireStatus alloc] initWithDictionary:(NSMutableDictionary *)obj];
@@ -134,7 +134,7 @@
 
 - (SDLSingleTireStatus *)innerRightRear {
     NSObject *obj = [store objectForKey:NAMES_innerRightRear];
-    if ([obj isKindOfClass:SDLSingleTireStatus.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLSingleTireStatus.class]) {
         return (SDLSingleTireStatus *)obj;
     } else {
         return [[SDLSingleTireStatus alloc] initWithDictionary:(NSMutableDictionary *)obj];
diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/SDLTurn.m b/SmartDeviceLink-iOS/SmartDeviceLink/SDLTurn.m
index e807f3aa6..875fa2e73 100644
--- a/SmartDeviceLink-iOS/SmartDeviceLink/SDLTurn.m
+++ b/SmartDeviceLink-iOS/SmartDeviceLink/SDLTurn.m
@@ -43,7 +43,7 @@
 
 - (SDLImage *)turnIcon {
     NSObject *obj = [store objectForKey:NAMES_turnIcon];
-    if ([obj isKindOfClass:SDLImage.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLImage.class]) {
         return (SDLImage *)obj;
     } else {
         return [[SDLImage alloc] initWithDictionary:(NSMutableDictionary *)obj];
diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/SDLUnsubscribeButton.m b/SmartDeviceLink-iOS/SmartDeviceLink/SDLUnsubscribeButton.m
index 5a5d126bf..9853fa9da 100644
--- a/SmartDeviceLink-iOS/SmartDeviceLink/SDLUnsubscribeButton.m
+++ b/SmartDeviceLink-iOS/SmartDeviceLink/SDLUnsubscribeButton.m
@@ -32,7 +32,7 @@
 
 - (SDLButtonName *)buttonName {
     NSObject *obj = [parameters objectForKey:NAMES_buttonName];
-    if ([obj isKindOfClass:SDLButtonName.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLButtonName.class]) {
         return (SDLButtonName *)obj;
     } else {
         return [SDLButtonName valueOf:(NSString *)obj];
diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.m b/SmartDeviceLink-iOS/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.m
index bdc2e3a80..ec4916447 100644
--- a/SmartDeviceLink-iOS/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.m
+++ b/SmartDeviceLink-iOS/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.m
@@ -32,7 +32,7 @@
 
 - (SDLVehicleDataResult *)gps {
     NSObject *obj = [parameters objectForKey:NAMES_gps];
-    if ([obj isKindOfClass:SDLVehicleDataResult.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) {
         return (SDLVehicleDataResult *)obj;
     } else {
         return [[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary *)obj];
@@ -49,7 +49,7 @@
 
 - (SDLVehicleDataResult *)speed {
     NSObject *obj = [parameters objectForKey:NAMES_speed];
-    if ([obj isKindOfClass:SDLVehicleDataResult.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) {
         return (SDLVehicleDataResult *)obj;
     } else {
         return [[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary *)obj];
@@ -66,7 +66,7 @@
 
 - (SDLVehicleDataResult *)rpm {
     NSObject *obj = [parameters objectForKey:NAMES_rpm];
-    if ([obj isKindOfClass:SDLVehicleDataResult.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) {
         return (SDLVehicleDataResult *)obj;
     } else {
         return [[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary *)obj];
@@ -83,7 +83,7 @@
 
 - (SDLVehicleDataResult *)fuelLevel {
     NSObject *obj = [parameters objectForKey:NAMES_fuelLevel];
-    if ([obj isKindOfClass:SDLVehicleDataResult.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) {
         return (SDLVehicleDataResult *)obj;
     } else {
         return [[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary *)obj];
@@ -100,7 +100,7 @@
 
 - (SDLVehicleDataResult *)fuelLevel_State {
     NSObject *obj = [parameters objectForKey:NAMES_fuelLevel_State];
-    if ([obj isKindOfClass:SDLVehicleDataResult.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) {
         return (SDLVehicleDataResult *)obj;
     } else {
         return [[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary *)obj];
@@ -117,7 +117,7 @@
 
 - (SDLVehicleDataResult *)instantFuelConsumption {
     NSObject *obj = [parameters objectForKey:NAMES_instantFuelConsumption];
-    if ([obj isKindOfClass:SDLVehicleDataResult.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) {
         return (SDLVehicleDataResult *)obj;
     } else {
         return [[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary *)obj];
@@ -134,7 +134,7 @@
 
 - (SDLVehicleDataResult *)externalTemperature {
     NSObject *obj = [parameters objectForKey:NAMES_externalTemperature];
-    if ([obj isKindOfClass:SDLVehicleDataResult.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) {
         return (SDLVehicleDataResult *)obj;
     } else {
         return [[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary *)obj];
@@ -151,7 +151,7 @@
 
 - (SDLVehicleDataResult *)prndl {
     NSObject *obj = [parameters objectForKey:NAMES_prndl];
-    if ([obj isKindOfClass:SDLVehicleDataResult.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) {
         return (SDLVehicleDataResult *)obj;
     } else {
         return [[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary *)obj];
@@ -168,7 +168,7 @@
 
 - (SDLVehicleDataResult *)tirePressure {
     NSObject *obj = [parameters objectForKey:NAMES_tirePressure];
-    if ([obj isKindOfClass:SDLVehicleDataResult.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) {
         return (SDLVehicleDataResult *)obj;
     } else {
         return [[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary *)obj];
@@ -185,7 +185,7 @@
 
 - (SDLVehicleDataResult *)odometer {
     NSObject *obj = [parameters objectForKey:NAMES_odometer];
-    if ([obj isKindOfClass:SDLVehicleDataResult.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) {
         return (SDLVehicleDataResult *)obj;
     } else {
         return [[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary *)obj];
@@ -202,7 +202,7 @@
 
 - (SDLVehicleDataResult *)beltStatus {
     NSObject *obj = [parameters objectForKey:NAMES_beltStatus];
-    if ([obj isKindOfClass:SDLVehicleDataResult.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) {
         return (SDLVehicleDataResult *)obj;
     } else {
         return [[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary *)obj];
@@ -219,7 +219,7 @@
 
 - (SDLVehicleDataResult *)bodyInformation {
     NSObject *obj = [parameters objectForKey:NAMES_bodyInformation];
-    if ([obj isKindOfClass:SDLVehicleDataResult.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) {
         return (SDLVehicleDataResult *)obj;
     } else {
         return [[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary *)obj];
@@ -236,7 +236,7 @@
 
 - (SDLVehicleDataResult *)deviceStatus {
     NSObject *obj = [parameters objectForKey:NAMES_deviceStatus];
-    if ([obj isKindOfClass:SDLVehicleDataResult.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) {
         return (SDLVehicleDataResult *)obj;
     } else {
         return [[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary *)obj];
@@ -253,7 +253,7 @@
 
 - (SDLVehicleDataResult *)driverBraking {
     NSObject *obj = [parameters objectForKey:NAMES_driverBraking];
-    if ([obj isKindOfClass:SDLVehicleDataResult.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) {
         return (SDLVehicleDataResult *)obj;
     } else {
         return [[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary *)obj];
@@ -270,7 +270,7 @@
 
 - (SDLVehicleDataResult *)wiperStatus {
     NSObject *obj = [parameters objectForKey:NAMES_wiperStatus];
-    if ([obj isKindOfClass:SDLVehicleDataResult.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) {
         return (SDLVehicleDataResult *)obj;
     } else {
         return [[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary *)obj];
@@ -287,7 +287,7 @@
 
 - (SDLVehicleDataResult *)headLampStatus {
     NSObject *obj = [parameters objectForKey:NAMES_headLampStatus];
-    if ([obj isKindOfClass:SDLVehicleDataResult.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) {
         return (SDLVehicleDataResult *)obj;
     } else {
         return [[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary *)obj];
@@ -304,7 +304,7 @@
 
 - (SDLVehicleDataResult *)engineTorque {
     NSObject *obj = [parameters objectForKey:NAMES_engineTorque];
-    if ([obj isKindOfClass:SDLVehicleDataResult.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) {
         return (SDLVehicleDataResult *)obj;
     } else {
         return [[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary *)obj];
@@ -321,7 +321,7 @@
 
 - (SDLVehicleDataResult *)accPedalPosition {
     NSObject *obj = [parameters objectForKey:NAMES_accPedalPosition];
-    if ([obj isKindOfClass:SDLVehicleDataResult.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) {
         return (SDLVehicleDataResult *)obj;
     } else {
         return [[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary *)obj];
@@ -338,7 +338,7 @@
 
 - (SDLVehicleDataResult *)steeringWheelAngle {
     NSObject *obj = [parameters objectForKey:NAMES_steeringWheelAngle];
-    if ([obj isKindOfClass:SDLVehicleDataResult.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) {
         return (SDLVehicleDataResult *)obj;
     } else {
         return [[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary *)obj];
@@ -355,7 +355,7 @@
 
 - (SDLVehicleDataResult *)eCallInfo {
     NSObject *obj = [parameters objectForKey:NAMES_eCallInfo];
-    if ([obj isKindOfClass:SDLVehicleDataResult.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) {
         return (SDLVehicleDataResult *)obj;
     } else {
         return [[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary *)obj];
@@ -372,7 +372,7 @@
 
 - (SDLVehicleDataResult *)airbagStatus {
     NSObject *obj = [parameters objectForKey:NAMES_airbagStatus];
-    if ([obj isKindOfClass:SDLVehicleDataResult.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) {
         return (SDLVehicleDataResult *)obj;
     } else {
         return [[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary *)obj];
@@ -389,7 +389,7 @@
 
 - (SDLVehicleDataResult *)emergencyEvent {
     NSObject *obj = [parameters objectForKey:NAMES_emergencyEvent];
-    if ([obj isKindOfClass:SDLVehicleDataResult.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) {
         return (SDLVehicleDataResult *)obj;
     } else {
         return [[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary *)obj];
@@ -406,7 +406,7 @@
 
 - (SDLVehicleDataResult *)clusterModes {
     NSObject *obj = [parameters objectForKey:NAMES_clusterModes];
-    if ([obj isKindOfClass:SDLVehicleDataResult.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) {
         return (SDLVehicleDataResult *)obj;
     } else {
         return [[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary *)obj];
@@ -423,7 +423,7 @@
 
 - (SDLVehicleDataResult *)myKey {
     NSObject *obj = [parameters objectForKey:NAMES_myKey];
-    if ([obj isKindOfClass:SDLVehicleDataResult.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) {
         return (SDLVehicleDataResult *)obj;
     } else {
         return [[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary *)obj];
diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/SDLVehicleDataResult.m b/SmartDeviceLink-iOS/SmartDeviceLink/SDLVehicleDataResult.m
index 6cc467188..3a0849f87 100644
--- a/SmartDeviceLink-iOS/SmartDeviceLink/SDLVehicleDataResult.m
+++ b/SmartDeviceLink-iOS/SmartDeviceLink/SDLVehicleDataResult.m
@@ -32,7 +32,7 @@
 
 - (SDLVehicleDataType *)dataType {
     NSObject *obj = [store objectForKey:NAMES_dataType];
-    if ([obj isKindOfClass:SDLVehicleDataType.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLVehicleDataType.class]) {
         return (SDLVehicleDataType *)obj;
     } else {
         return [SDLVehicleDataType valueOf:(NSString *)obj];
@@ -49,7 +49,7 @@
 
 - (SDLVehicleDataResultCode *)resultCode {
     NSObject *obj = [store objectForKey:NAMES_resultCode];
-    if ([obj isKindOfClass:SDLVehicleDataResultCode.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLVehicleDataResultCode.class]) {
         return (SDLVehicleDataResultCode *)obj;
     } else {
         return [SDLVehicleDataResultCode valueOf:(NSString *)obj];
diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/SDLVrHelpItem.m b/SmartDeviceLink-iOS/SmartDeviceLink/SDLVrHelpItem.m
index 09ffd7b56..4ed2c1409 100644
--- a/SmartDeviceLink-iOS/SmartDeviceLink/SDLVrHelpItem.m
+++ b/SmartDeviceLink-iOS/SmartDeviceLink/SDLVrHelpItem.m
@@ -43,7 +43,7 @@
 
 - (SDLImage *)image {
     NSObject *obj = [store objectForKey:NAMES_image];
-    if ([obj isKindOfClass:SDLImage.class]) {
+    if (obj == nil || [obj isKindOfClass:SDLImage.class]) {
         return (SDLImage *)obj;
     } else {
         return [[SDLImage alloc] initWithDictionary:(NSMutableDictionary *)obj];