=== modified file 'dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/DebugUtils.java' --- dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/DebugUtils.java 2014-08-15 07:40:20 +0000 +++ dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/DebugUtils.java 2014-08-27 10:35:22 +0000 @@ -137,10 +137,14 @@ public static String getStackTrace( Throwable t ) { StringWriter sw = new StringWriter(); - PrintWriter pw = new PrintWriter( sw, true ); - t.printStackTrace( pw ); - pw.flush(); - sw.flush(); + + if ( t != null ) + { + PrintWriter pw = new PrintWriter( sw, true ); + t.printStackTrace( pw ); + pw.flush(); + sw.flush(); + } return sw.toString(); }