diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner2/Scanner2.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner2/Scanner2.java
index 943bb578ddc..782968b6bea 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner2/Scanner2.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner2/Scanner2.java
@@ -365,6 +365,9 @@ public class Scanner2 implements IScanner, IScannerData {
 			}
 			catch( Exception e )
 			{
+			    if( e instanceof OffsetLimitReachedException )
+			        throw (OffsetLimitReachedException) e;
+
 			    exception = true;
 				errorHandle();
 			}
@@ -396,6 +399,9 @@ public class Scanner2 implements IScanner, IScannerData {
 		}
 		catch( Exception e )
 		{
+		    if( e instanceof OffsetLimitReachedException )
+		        throw (OffsetLimitReachedException) e;
+		    
 		    nextToken = null;
 		    exception = true;
 			errorHandle();