diff --git a/smack-core/src/main/java/org/jivesoftware/smack/util/PacketParserUtils.java b/smack-core/src/main/java/org/jivesoftware/smack/util/PacketParserUtils.java
index 6a7e8d9ab..ac5ea11b8 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/util/PacketParserUtils.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/util/PacketParserUtils.java
@@ -576,7 +576,9 @@ public class PacketParserUtils {
                     try {
                         PacketParserUtils.addExtensionElement(presence, parser, elementName, namespace);
                     } catch (Exception e) {
-                        LOGGER.log(Level.WARNING, "Failed to parse extension packet in Presence packet.", e);
+                        LOGGER.log(Level.WARNING,
+                                        "Failed to parse extension packet in Presence packet. Attributes: from="
+                                                        + presence.getFrom() + " id=" + presence.getStanzaId(), e);
                     }
                     break;
                 }
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/caps/provider/CapsExtensionProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/caps/provider/CapsExtensionProvider.java
index 0eba8f4e2..e7efd791a 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/caps/provider/CapsExtensionProvider.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/caps/provider/CapsExtensionProvider.java
@@ -51,7 +51,8 @@ public class CapsExtensionProvider extends ExtensionElementProvider<CapsExtensio
         if (hash != null && version != null && node != null) {
             return new CapsExtension(node, version, hash);
         } else {
-            throw new SmackException("Caps elment with missing attributes");
+            throw new SmackException("Caps elment with missing attributes. Attributes: hash=" + hash + " version="
+                            + version + " node=" + node);
         }
     }