diff --git a/source/org/jivesoftware/smack/XMPPConnection.java b/source/org/jivesoftware/smack/XMPPConnection.java
index 6e1828655..8539dda13 100644
--- a/source/org/jivesoftware/smack/XMPPConnection.java
+++ b/source/org/jivesoftware/smack/XMPPConnection.java
@@ -690,13 +690,18 @@ public class XMPPConnection {
             // Detect the debugger class to use.             
             String className = System.getProperty("smack.debuggerClass");
             Class debuggerClass = null;
-            try {
-                debuggerClass = Class.forName(className);
+            if (className != null) {
+                try {
+                    debuggerClass = Class.forName(className);
+                }
+                catch (Exception e) {
+                    e.printStackTrace();
+                }
             }
-            catch (Exception e) {
+            if (debuggerClass == null) {
                 try {
                     debuggerClass =
-                        Class.forName("org.jivesoftware.smackx.debugger.EnhancedDebugger");
+                            Class.forName("org.jivesoftware.smackx.debugger.EnhancedDebugger");
                 }
                 catch (Exception ex) {
                     debuggerClass = LiteDebugger.class;