diff --git a/src/test/java/teammates/test/pageobjects/InstructorCourseEditPage.java b/src/test/java/teammates/test/pageobjects/InstructorCourseEditPage.java
index 7a19cedf0b6..8e850fdbb5a 100644
--- a/src/test/java/teammates/test/pageobjects/InstructorCourseEditPage.java
+++ b/src/test/java/teammates/test/pageobjects/InstructorCourseEditPage.java
@@ -182,6 +182,7 @@ public void closeModal() {
         try {
             Thread.sleep(1000);
         } catch (InterruptedException e) {
+            throw new RuntimeException(e);
         }
     }
     
diff --git a/static-analysis/teammates-checkstyle.xml b/static-analysis/teammates-checkstyle.xml
index 0b05038de50..b26c1343236 100644
--- a/static-analysis/teammates-checkstyle.xml
+++ b/static-analysis/teammates-checkstyle.xml
@@ -62,6 +62,12 @@
     </module>
     <module name="LocalVariableName"/>
     <module name="ParameterName"/>
+    <module name="AvoidNestedBlocks"/>
+    <module name="EmptyBlock">
+      <property name="option" value="text"/>
+      <property name="tokens" value="LITERAL_CATCH,LITERAL_DO,LITERAL_ELSE,LITERAL_FINALLY,LITERAL_FOR,LITERAL_IF,INSTANCE_INIT,STATIC_INIT,LITERAL_SWITCH,LITERAL_TRY,LITERAL_WHILE"/>
+    </module>
+    <module name="EmptyCatchBlock"/>
     <module name="EmptyStatement"/>
     <module name="DefaultComesLast"/>
     <module name="ExplicitInitialization"/>