Merge pull request #369 from InsertWittyName/NilErrorFix

Fix crash if underlyingError parameter is nil.
kif-framework · Apr 11, 2014 · 7379c21 · 7379c21
2 parents 3f9c203 + ccad533
commit 7379c21
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/Additions/NSError-KIFAdditions.m b/Additions/NSError-KIFAdditions.m
@@ -31,7 +31,9 @@ + (instancetype)KIFErrorWithUnderlyingError:(NSError *)underlyingError format:(N
     NSString *description = [[NSString alloc] initWithFormat:format arguments:args];
     va_end(args);
 
-    return [self errorWithDomain:@"KIFTest" code:KIFTestStepResultFailure userInfo:@{NSLocalizedDescriptionKey: description, NSUnderlyingErrorKey: underlyingError}];
+    NSDictionary *userInfo = [[NSDictionary alloc] initWithObjectsAndKeys:description, NSLocalizedDescriptionKey, underlyingError, NSUnderlyingErrorKey, nil];
+
+    return [self errorWithDomain:@"KIFTest" code:KIFTestStepResultFailure userInfo:userInfo];
 }
 
 @end