Index: trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java	(revision 14502)
+++ trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java	(revision 14504)
@@ -1064,5 +1064,5 @@
     protected static void removeClipboardDataFor(OsmDataLayer osm) {
         Transferable clipboardContents = ClipboardUtils.getClipboardContent();
-        if (clipboardContents != null) {
+        if (clipboardContents != null && clipboardContents.isDataFlavorSupported(OsmLayerTransferData.OSM_FLAVOR)) {
             try {
                 Object o = clipboardContents.getTransferData(OsmLayerTransferData.OSM_FLAVOR);