diff --git a/core/java/src/net/i2p/data/Base64.java b/core/java/src/net/i2p/data/Base64.java
index fa915ef990e8cb25512f4796ec5c3c5c92c8fc54..b7da7ed5185ade417e96a49c1a65c865ff354e07 100644
--- a/core/java/src/net/i2p/data/Base64.java
+++ b/core/java/src/net/i2p/data/Base64.java
@@ -142,7 +142,7 @@ public class Base64 {
     }
 
     public static void main(String[] args) {
-        test();
+        //test();
         if (args.length == 0) {
             help();
             return;
@@ -399,6 +399,7 @@ public class Base64 {
      * replacing / with ~, and + with -
      */
     private static byte[] safeDecode(String source, boolean useStandardAlphabet) {
+        if (source == null) return null;
         String toDecode = null;
         if (useStandardAlphabet) {
             toDecode = source;