Index: text/src/main/java/java/text/DecimalFormat.java =================================================================== --- text/src/main/java/java/text/DecimalFormat.java (revision 482595) +++ text/src/main/java/java/text/DecimalFormat.java (working copy) @@ -281,10 +281,10 @@ */ @Override public Currency getCurrency() { - if (dform.getCurrency() == null) { - return null; - } - return Currency.getInstance(dform.getCurrency().getCurrencyCode()); + final com.ibm.icu.util.Currency cur = dform.getCurrency(); + final String code = (cur == null) ? "XXX" : cur.getCurrencyCode(); //$NON-NLS-1$ + + return Currency.getInstance(code); } /**