---

Ajay Kannan · Ajay Kannan · commit 9bbbe6c87f04 · 2015-11-10T15:38:36.000-08:00
yaml --- r: 6483 b: refs/heads/tswast-patch-1 c: 6c40825 h: refs/heads/master i: 6481: a5fdd36 6479: 43c4607
diff --git a/[refs] b/[refs]
@@ -57,5 +57,5 @@ refs/tags/v0.18.0: 9d193c4c4b9d1c6f21515dd8e50836b9194ec9bb
 refs/tags/v0.19.0: e67b56e4d8dad5f9a7b38c9b2107c23c828f2ed5
 refs/tags/v0.20.0: 839f7fb7156535146aa1cb2c5aadd8d375d854e8
 refs/tags/v0.20.1: 370471f437f1f4f68a11e068df5cd6bf39edb1fa
-refs/heads/tswast-patch-1: ad12f4143bbcb5d6557055452717c7380cf54959
+refs/heads/tswast-patch-1: 6c408256e1621c7e0f3640fb7a4ffdef139f5241
 refs/heads/pubsub-streaming-pull: 19262b752ee874eb2ca3b950eb2aef44d5a5267b
diff --git a/branches/tswast-patch-1/gcloud-java-core/src/main/java/com/google/gcloud/ServiceOptions.java b/branches/tswast-patch-1/gcloud-java-core/src/main/java/com/google/gcloud/ServiceOptions.java
@@ -17,7 +17,7 @@
 package com.google.gcloud;
 
 import static com.google.common.base.MoreObjects.firstNonNull;
-import static com.google.common.base.Preconditions.checkNotNull;
+import static com.google.common.base.Preconditions.checkArgument;
 import static java.nio.charset.StandardCharsets.UTF_8;
 
 import com.google.api.client.extensions.appengine.http.UrlFetchTransport;
@@ -308,7 +308,10 @@ protected ServiceOptions(Class<? extends ServiceFactory<ServiceT, OptionsT>> ser
       Builder<ServiceT, ServiceRpcT, OptionsT, ?> builder) {
     projectId = builder.projectId != null ? builder.projectId : defaultProject();
     if (projectIdRequired()) {
-      checkNotNull(projectId);
+      checkArgument(
+          projectId != null,
+          "A project ID is required for this service but could not be determined from the builder or "
+          + "the environment.  Please set a project ID using the builder.");
     }
     host = firstNonNull(builder.host, defaultHost());
     httpTransportFactory = firstNonNull(builder.httpTransportFactory,
@@ -334,7 +337,7 @@ protected ServiceOptions(Class<? extends ServiceFactory<ServiceT, OptionsT>> ser
    *
    * @return true if a project ID is required to use the service, false if not.
    */
-  public boolean projectIdRequired() {
+  protected boolean projectIdRequired() {
     return true;
   }
 
