diff --git a/ebean-api/src/main/java/io/ebean/Database.java b/ebean-api/src/main/java/io/ebean/Database.java
index c7cad0cf7..9c69e33fd 100644
--- a/ebean-api/src/main/java/io/ebean/Database.java
+++ b/ebean-api/src/main/java/io/ebean/Database.java
@@ -576,8 +576,8 @@ public interface Database {
   <T> DtoQuery<T> createNamedDtoQuery(Class<T> dtoType, String namedQuery);
 
   /**
-   * Look to execute a native sql query that does not returns beans but instead
-   * returns SqlRow or direct access to ResultSet (see {@link SqlQuery#findList(RowMapper)}.
+   * Look to execute a native sql query that does not return beans but instead
+   * returns SqlRow or direct access to ResultSet.
    *
    * <p>
    * Refer to {@link DtoQuery} for native sql queries returning DTO beans.
@@ -1613,6 +1613,7 @@ public interface Database {
    * @param id          the id of the entity bean
    * @param transaction the transaction the publish process should use (can be null)
    */
+  @Nullable
   <T> T publish(Class<T> beanType, Object id, Transaction transaction);
 
   /**
@@ -1626,6 +1627,7 @@ public interface Database {
    * @param beanType the type of the entity bean
    * @param id       the id of the entity bean
    */
+  @Nullable
   <T> T publish(Class<T> beanType, Object id);
 
   /**
@@ -1664,6 +1666,7 @@ public interface Database {
    * @param id          the id of the entity bean to restore
    * @param transaction the transaction the restore process should use (can be null)
    */
+  @Nullable
   <T> T draftRestore(Class<T> beanType, Object id, Transaction transaction);
 
   /**
@@ -1677,6 +1680,7 @@ public interface Database {
    * @param beanType the type of the entity bean
    * @param id       the id of the entity bean to restore
    */
+  @Nullable
   <T> T draftRestore(Class<T> beanType, Object id);
 
   /**
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
index 189dc348f..3ad4f9539 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
@@ -1711,6 +1711,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
     return executeInTrans((txn) -> persister.publish(query, txn), transaction);
   }
 
+  @Nullable
   @Override
   public <T> T publish(Class<T> beanType, Object id) {
     return publish(beanType, id, null);
@@ -1721,6 +1722,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
     return publish(query, null);
   }
 
+  @Nullable
   @Override
   public <T> T publish(Class<T> beanType, Object id, @Nullable Transaction transaction) {
     Query<T> query = find(beanType).setId(id);
@@ -1733,6 +1735,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
     return executeInTrans((txn) -> persister.draftRestore(query, txn), transaction);
   }
 
+  @Nullable
   @Override
   public <T> T draftRestore(Class<T> beanType, Object id, @Nullable Transaction transaction) {
     Query<T> query = find(beanType).setId(id);
@@ -1740,6 +1743,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
     return (beans.size() == 1) ? beans.get(0) : null;
   }
 
+  @Nullable
   @Override
   public <T> T draftRestore(Class<T> beanType, Object id) {
     return draftRestore(beanType, id, null);