diff --git a/objc-appscript/trunk/src/Appscript/application.m b/objc-appscript/trunk/src/Appscript/application.m
index c9d6237..0b64cbd 100644
--- a/objc-appscript/trunk/src/Appscript/application.m
+++ b/objc-appscript/trunk/src/Appscript/application.m
@@ -17,12 +17,12 @@ + (NSURL *)findApplicationForCreator:(OSType)creator
 							bundleID:(NSString *)bundleID
 								name:(NSString *)name
 							   error:(out NSError **)error {
-	OSErr err;
+	OSStatus err;
 	CFURLRef outAppURL;
 	NSString *errorDescription;
 	NSDictionary *errorInfo;
 	
-	*error = nil;
+	if (error) *error = nil;
 	err = LSFindApplicationForInfo(creator,
 								   (CFStringRef)bundleID,
 								   (CFStringRef)name,
@@ -70,7 +70,7 @@ + (pid_t)findProcessIDForApplication:(NSURL *)fileURL error:(out NSError **)erro
 	NSDictionary *errorInfo;
 	pid_t pid;
 	
-	*error = nil;
+	if (error) *error = nil;
 	if (!fileURL || !CFURLGetFSRef((CFURLRef)fileURL, &desired)) {
 		err = errFSBadFSRef;
 		goto error;
@@ -155,7 +155,7 @@ + (pid_t)launchApplication:(NSURL *)fileURL
 	NSString *errorDescription;
 	NSDictionary *errorInfo;
 	
-	*error = nil;
+	if (error) *error = nil;
 	if (!fileURL || !CFURLGetFSRef((CFURLRef)fileURL, &fsRef)) {
 		err = fnfErr;
 		goto error;