1 files changed, 14 insertions, 3 deletions
diff --git a/SmartDeviceLink/SDLRPCNotificationNotification.m b/SmartDeviceLink/SDLRPCNotificationNotification.m
index e32c11714..44cc88264 100644
--- a/SmartDeviceLink/SDLRPCNotificationNotification.m
+++ b/SmartDeviceLink/SDLRPCNotificationNotification.m
@@ -11,16 +11,27 @@
 #import "SDLNotificationConstants.h"
 #import "SDLRPCNotification.h"
 
+NS_ASSUME_NONNULL_BEGIN
 
 @implementation SDLRPCNotificationNotification
 
+@synthesize name=_name;
+@synthesize object=_object;
+@synthesize userInfo=_userInfo;
+
 - (instancetype)initWithName:(NSString *)name object:(id)object rpcNotification:(SDLRPCNotification *)notification {
-    self = [self initWithName:name object:object userInfo:@{SDLNotificationUserInfoObject : notification}];
-    if (!self) { return nil; }
     
-    _notification = notification;
+    _name = name;
+    _object = object;
+    _userInfo = @{SDLNotificationUserInfoObject : notification};
     
     return self;
 }
 
+- (SDLRPCNotification *)notification {
+    return _userInfo[SDLNotificationUserInfoObject];
+}
+
 @end
+
+NS_ASSUME_NONNULL_END
+\ No newline at end of file