diff --git a/dspace-api/pom.xml b/dspace-api/pom.xml
index 59353749bc..677a24b84a 100644
--- a/dspace-api/pom.xml
+++ b/dspace-api/pom.xml
@@ -51,21 +51,31 @@
                     <debug>true</debug>
                     <showDeprecation>true</showDeprecation>
                     <annotationProcessorPaths>
+                        <!-- Enable Hibernate's Metamodel Generator to generate metadata model classes
+                             (ending in _ suffix) for more type-safe Criteria queries -->
                         <path>
                             <groupId>org.hibernate</groupId>
                             <artifactId>hibernate-jpamodelgen</artifactId>
                             <version>${hibernate.version}</version>
                         </path>
+                        <!-- Enable JAXB -->
                         <path>
                             <groupId>javax.xml.bind</groupId>
                             <artifactId>jaxb-api</artifactId>
                             <version>${jaxb-api.version}</version>
                         </path>
+                        <!-- Enable Commons Annotations -->
                         <path>
                             <groupId>javax.annotation</groupId>
                             <artifactId>javax.annotation-api</artifactId>
                             <version>${javax-annotation.version}</version>
                         </path>
+                        <!-- Enable http://errorprone.info -->
+                        <path>
+                            <groupId>com.google.errorprone</groupId>
+                            <artifactId>error_prone_core</artifactId>
+                            <version>${errorprone.version}</version>
+                        </path>
                     </annotationProcessorPaths>
                 </configuration>
             </plugin>
diff --git a/pom.xml b/pom.xml
index 85dab74cd7..0579dfa19e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,6 +30,7 @@
         <jaxb-runtime.version>2.3.1</jaxb-runtime.version>
         <javax-annotation.version>1.3.2</javax-annotation.version>
         <jmockit.version>1.48</jmockit.version>
+        <errorprone.version>2.3.4</errorprone.version>
         <log4j.version>2.11.2</log4j.version>
         <slf4j.version>1.7.25</slf4j.version>
         <!-- NOTE: when updating jackson.version, also sync jackson-databind dependency below -->
@@ -101,6 +102,18 @@
                     <version>3.8.1</version>
                     <configuration>
                         <release>11</release>
+                        <!-- Turn on http://errorprone.info -->
+                        <compilerArgs>
+                            <arg>-XDcompilePolicy=simple</arg>
+                            <arg>-Xplugin:ErrorProne</arg>
+                        </compilerArgs>
+                        <annotationProcessorPaths>
+                            <path>
+                                <groupId>com.google.errorprone</groupId>
+                                <artifactId>error_prone_core</artifactId>
+                                <version>${errorprone.version}</version>
+                            </path>
+                        </annotationProcessorPaths>
                     </configuration>
                 </plugin>
                 <!-- Used to package all DSpace JARs -->
@@ -1494,6 +1507,12 @@
                 <artifactId>log4j-over-slf4j</artifactId>
                 <version>${slf4j.version}</version>
             </dependency>
+            <!-- http://errorprone.info : used to check for common/obvious code errors during compilation -->
+            <dependency>
+                <groupId>com.google.errorprone</groupId>
+                <artifactId>error_prone_core</artifactId>
+                <version>${errorprone.version}</version>
+            </dependency>
             <!-- JMockit, JUnit and Hamcrest are used for Unit/Integration tests -->
             <!-- Keep jmockit before junit -->
             <dependency>