--- a/jdk/src/java.base/share/classes/javax/crypto/KeyGenerator.java	Tue Dec 20 13:46:44 2016 -0800
+++ b/jdk/src/java.base/share/classes/javax/crypto/KeyGenerator.java	Tue Dec 20 17:13:34 2016 -0500
@@ -154,7 +154,7 @@
 
         if (!skipDebug && pdebug != null) {
             pdebug.println("KeyGenerator." + algorithm + " algorithm from: " +
-                this.provider.getName());
+                getProviderName());
         }
     }
 
@@ -172,10 +172,14 @@
 
         if (!skipDebug && pdebug != null) {
             pdebug.println("KeyGenerator." + algorithm + " algorithm from: " +
-                this.provider.getName());
+                getProviderName());
         }
     }
 
+    private String getProviderName() {
+        return (provider == null) ? "(no provider)" : provider.getName();
+    }
+
     /**
      * Returns the algorithm name of this {@code KeyGenerator} object.
      *