diff -r a3bd88c2d66a -r ff87fda24d33 jdk/test/sun/security/ssl/templates/SSLSocketTemplate.java
--- a/jdk/test/sun/security/ssl/templates/SSLSocketTemplate.java	Tue Aug 20 14:23:32 2013 -0700
+++ b/jdk/test/sun/security/ssl/templates/SSLSocketTemplate.java	Wed Aug 21 19:44:35 2013 -0700
@@ -243,7 +243,7 @@
          * output it.
          */
         if (exception != null) {
-            if (exception != startException) {
+            if (exception != startException && startException != null) {
                 exception.addSuppressed(startException);
             }
             throw exception;