@@ -30,6 +30,9 @@ public class BasicDataEncryptionManager implements DataEncryptionManager {
      * (byte[])
      */
     public String decryptData(byte[] encrypted) throws Exception {
+        if(encrypted == null) {
+            return "";
+        }
         return new String(encrypted);
     }
Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,9 @@ public class BasicDataEncryptionManager implements DataEncryptionManager {`
`30`	`30`	`* (byte[])`
`31`	`31`	`*/`
`32`	`32`	`public String decryptData(byte[] encrypted) throws Exception {`
	`33`	`+ if(encrypted == null) {`
	`34`	`+ return "";`
	`35`	`+ }`
`33`	`36`	`return new String(encrypted);`
`34`	`37`	`}`
`35`	`38`