diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/PublishCommentScreen.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/PublishCommentScreen.java
index ecb9a045ff..a4a3fdaffa 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/PublishCommentScreen.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/PublishCommentScreen.java
@@ -267,10 +267,12 @@ public class PublishCommentScreen extends AccountScreen implements
     vp.setStyleName(Gerrit.RESOURCES.css().approvalCategoryList());
 
     Short prior = null;
-    for (ApprovalInfo app : Natives.asList(label.all())) {
-      if (app._account_id() == Gerrit.getUserAccount().getId().get()) {
-        prior = app.value();
-        break;
+    if (label.all() != null) {
+      for (ApprovalInfo app : Natives.asList(label.all())) {
+        if (app._account_id() == Gerrit.getUserAccount().getId().get()) {
+          prior = app.value();
+          break;
+        }
       }
     }
 
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/rpc/Natives.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/rpc/Natives.java
index e048dcf656..41f0f23483 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/rpc/Natives.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/rpc/Natives.java
@@ -37,6 +37,9 @@ public class Natives {
 
   public static <T extends JavaScriptObject> List<T> asList(
       final JsArray<T> arr) {
+    if (arr == null) {
+      return null;
+    }
     return new AbstractList<T>() {
       @Override
       public T set(int index, T element) {