diff --git a/layout/generic/nsFrame.cpp b/layout/generic/nsFrame.cpp
index e139a285b029..b431c5880828 100644
--- a/layout/generic/nsFrame.cpp
+++ b/layout/generic/nsFrame.cpp
@@ -3737,6 +3737,8 @@ nsFrame::GetFrameFromDirection(nsIPresContext* aPresContext, nsPeekOffsetStruct
                            &lineFlags);
       if (NS_FAILED(result))
         return result;
+      if (!firstFrame)
+        return NS_ERROR_FAILURE;
 
       lastFrame = firstFrame;
       for (;lineFrameCount > 1;lineFrameCount --){
diff --git a/layout/html/base/src/nsFrame.cpp b/layout/html/base/src/nsFrame.cpp
index e139a285b029..b431c5880828 100644
--- a/layout/html/base/src/nsFrame.cpp
+++ b/layout/html/base/src/nsFrame.cpp
@@ -3737,6 +3737,8 @@ nsFrame::GetFrameFromDirection(nsIPresContext* aPresContext, nsPeekOffsetStruct
                            &lineFlags);
       if (NS_FAILED(result))
         return result;
+      if (!firstFrame)
+        return NS_ERROR_FAILURE;
 
       lastFrame = firstFrame;
       for (;lineFrameCount > 1;lineFrameCount --){