diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFHyperlink.java b/src/java/org/apache/poi/hssf/usermodel/HSSFHyperlink.java
index dbefaabe5..1f3175121 100644
--- a/src/java/org/apache/poi/hssf/usermodel/HSSFHyperlink.java
+++ b/src/java/org/apache/poi/hssf/usermodel/HSSFHyperlink.java
@@ -78,6 +78,8 @@ public class HSSFHyperlink implements Hyperlink {
             case LINK_DOCUMENT:
                 record.newDocumentLink();
                 break;
+            default:
+                throw new IllegalArgumentException("Invalid type: " + type);
         }
     }
 
diff --git a/src/java/org/apache/poi/ss/util/AreaReference.java b/src/java/org/apache/poi/ss/util/AreaReference.java
index f04633848..6d2e4530b 100644
--- a/src/java/org/apache/poi/ss/util/AreaReference.java
+++ b/src/java/org/apache/poi/ss/util/AreaReference.java
@@ -355,10 +355,11 @@ public class AreaReference {
                         }
                         delimiterPos = i;
                     }
-                default:
-                    continue;
-                case SPECIAL_NAME_DELIMITER:
                     // fall through
+                default:
+                    continue; //continue the for-loop
+                case SPECIAL_NAME_DELIMITER:
+                    break;
             }
             if(!insideDelimitedName) {
                 insideDelimitedName = true;
diff --git a/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFCell.java b/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFCell.java
index 7ef52c1a7..cf1b41990 100644
--- a/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFCell.java
+++ b/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFCell.java
@@ -779,6 +779,10 @@ public class SXSSFCell implements Cell {
                     current=new HyperlinkProperty(value);
                     break;
                 }
+                default:
+                {
+                    throw new IllegalArgumentException("Invalid type: " + type);
+                }
             }
             if(previous!=null)
             {