diff --git a/ChangeLog b/ChangeLog
index b94fc33d..95014035 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2015-03-02 00:04-EST Gregory John Casamento <greg.casamento@gmail.com>
+
+	* GormObjCHeaderParser/NSScanner+OCHeaderParser.m
+	* GormObjCHeaderParser/OCHeaderParser.m: Fix for crash seen after
+	last commit.
+
 2015-03-02 00:04-EST Gregory John Casamento <greg.casamento@gmail.com>
 
 	* GormObjCHeaderParser/OCHeaderParser.m: Add _stripRedundantStatements
diff --git a/GormObjCHeaderParser/NSScanner+OCHeaderParser.m b/GormObjCHeaderParser/NSScanner+OCHeaderParser.m
index ffc189f9..d9fa727d 100644
--- a/GormObjCHeaderParser/NSScanner+OCHeaderParser.m
+++ b/GormObjCHeaderParser/NSScanner+OCHeaderParser.m
@@ -30,25 +30,31 @@
 - (void) scanUpToAndIncludingString: (NSString *)string 
 			 intoString: (NSString **)buffer
 {
-  NSString *buffer2;
+  NSString *buffer2 = nil;
   [self scanUpToString: string intoString: buffer];
   [self scanString: string intoString: &buffer2];
+
   if(buffer != NULL)
     {
-      *buffer = [*buffer stringByAppendingString: buffer2];
+      if(*buffer != NULL)
+	{
+	  *buffer = [*buffer stringByAppendingString: buffer2];
+	}
     }
-
 }
 
 - (void) scanUpToAndIncludingCharactersFromSet: (NSCharacterSet *)set 
 				    intoString: (NSString **)buffer
 {
-  NSString *buffer2;  
+  NSString *buffer2 = nil;  
   [self scanUpToCharactersFromSet: set intoString: buffer];
   [self scanCharactersFromSet: set intoString: &buffer2]; 
   if(buffer != NULL)
     {
-      *buffer = [*buffer stringByAppendingString: buffer2];
+      if(*buffer != NULL)
+	{
+	  *buffer = [*buffer stringByAppendingString: buffer2];
+	}
     }
 }
 @end
diff --git a/GormObjCHeaderParser/OCHeaderParser.m b/GormObjCHeaderParser/OCHeaderParser.m
index e4f9bdb5..af084030 100644
--- a/GormObjCHeaderParser/OCHeaderParser.m
+++ b/GormObjCHeaderParser/OCHeaderParser.m
@@ -101,7 +101,7 @@
   [scanner setCharactersToBeSkipped: nil];
   while(![scanner isAtEnd])
     {
-      NSString *tempString = nil;
+      NSString *tempString = @"";
       [scanner scanUpToString: @"#" intoString: &tempString];
       [scanner scanUpToAndIncludingString: @"\n" intoString: NULL];
       resultString = [resultString stringByAppendingString: tempString];
@@ -121,6 +121,8 @@
   while(![scanner isAtEnd])
     {
       NSString *tempString = nil, *aString = nil;
+      // [scanner scanUpToString: @";" intoString: &tempString];
+      // [scanner scanString: @";" intoString: &tempString2];
       [scanner scanUpToAndIncludingString: @";" intoString: &tempString];
       
       // Scan any redundant ";" characters into aString... once it