From 781dc20dc4ceb654067c92b36524b8753a47a42c Mon Sep 17 00:00:00 2001
From: Stephen Tramer <sptramer@gmail.com>
Date: Thu, 15 Dec 2011 15:19:18 -0800
Subject: [PATCH] [TIMOB-6457] - Exception message processing now returns an
 appropriate error message even if the source isn't available - Change
 C++-style 'throw' to Obj-C style '@throw'

---
 iphone/Classes/KrollContext.mm | 3 ++-
 iphone/Classes/TiUtils.m       | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/iphone/Classes/KrollContext.mm b/iphone/Classes/KrollContext.mm
index f07b3a3a7c8..8313aa2345b 100644
--- a/iphone/Classes/KrollContext.mm
+++ b/iphone/Classes/KrollContext.mm
@@ -573,7 +573,8 @@ -(id)invokeWithResult:(KrollContext*)context
 		NSLog(@"[ERROR] Script Error = %@",[TiUtils exceptionMessage:excm]);
 		fflush(stderr);
 		TiStringRelease(js);
-		throw excm;
+
+		@throw excm;
 	}
 	
 	TiStringRelease(js);
diff --git a/iphone/Classes/TiUtils.m b/iphone/Classes/TiUtils.m
index 016560d3137..e893e1a86f9 100644
--- a/iphone/Classes/TiUtils.m
+++ b/iphone/Classes/TiUtils.m
@@ -1135,6 +1135,7 @@ +(NSString*)exceptionMessage:(id)arg
 				id lineNumber = [arg objectForKey:@"line"];
 				return [NSString stringWithFormat:@"%@ at %@ (line %@)",message,[source lastPathComponent],lineNumber];
 			}
+            return [NSString stringWithFormat:@"%@ (unknown file)", message];
 		}
 	}
 	return arg;