diff --git a/generateJava.cpp b/generateJava.cpp
index a4b53b4..bc44d08 100644
--- a/generateJava.cpp
+++ b/generateJava.cpp
@@ -199,7 +199,7 @@
 
     out << "public static "
         << ifaceName
-        << " getService(String serviceName) {\n";
+        << " getService(String serviceName) throws RemoteException {\n";
 
     out.indent();
 
@@ -451,7 +451,7 @@
     out.unindent();
     out << "}\n\n";
 
-    out << "public void registerAsService(String serviceName) {\n";
+    out << "public void registerAsService(String serviceName) throws RemoteException {\n";
     out.indent();
 
     out << "registerService(interfaceChain(), serviceName);\n";
diff --git a/test/java_test/src/com/android/commands/hidl_test_java/HidlTestJava.java b/test/java_test/src/com/android/commands/hidl_test_java/HidlTestJava.java
index 0050045..f5fd258 100644
--- a/test/java_test/src/com/android/commands/hidl_test_java/HidlTestJava.java
+++ b/test/java_test/src/com/android/commands/hidl_test_java/HidlTestJava.java
@@ -1011,7 +1011,7 @@
         }
     }
 
-    private void server() {
+    private void server() throws RemoteException {
         Baz baz = new Baz();
         baz.registerAsService("baz");