Index: /applications/editors/josm/plugins/toms/src/toms/dialogs/SmpDialogAction.java
===================================================================
--- /applications/editors/josm/plugins/toms/src/toms/dialogs/SmpDialogAction.java	(revision 23409)
+++ /applications/editors/josm/plugins/toms/src/toms/dialogs/SmpDialogAction.java	(revision 23410)
@@ -382,5 +382,5 @@
 		if (keys.containsKey("seamark:type")) //$NON-NLS-1$
 			type = keys.get("seamark:type"); //$NON-NLS-1$
-		
+
 		if (type.equals("buoy_lateral") || type.equals("beacon_lateral")) { //$NON-NLS-1$ //$NON-NLS-2$
 			buoy = new BuoyLat(this, node);
@@ -833,6 +833,8 @@
 
 					case SeaMark.UNKNOWN_TYPE:
-						if (!(buoy instanceof BuoyUkn))
+						if (!(buoy instanceof BuoyUkn)) {
+							buoy = null;
 							buoy = new BuoyUkn(dia, Messages.getString("SmpDialogAction.150")); //$NON-NLS-1$
+						}
 						buoy.setBuoyIndex(0);
 						break;
@@ -840,4 +842,5 @@
 					case SeaMark.LATERAL:
 						if (!(buoy instanceof BuoyLat)) {
+							buoy = null;
 							buoy = new BuoyLat(dia, n);
 							buoy.setBuoyIndex(0);
@@ -847,4 +850,5 @@
 					case SeaMark.CARDINAL:
 						if (!(buoy instanceof BuoyCard)) {
+							buoy = null;
 							buoy = new BuoyCard(dia, n);
 							buoy.setBuoyIndex(0);
@@ -854,4 +858,5 @@
 					case SeaMark.SAFE_WATER:
 						if (!(buoy instanceof BuoySaw)) {
+							buoy = null;
 							buoy = new BuoySaw(dia, n);
 						}
@@ -861,4 +866,5 @@
 					case SeaMark.ISOLATED_DANGER:
 						if (!(buoy instanceof BuoyIsol)) {
+							buoy = null;
 							buoy = new BuoyIsol(dia, n);
 						}
@@ -868,4 +874,5 @@
 					case SeaMark.SPECIAL_PURPOSE:
 						if (!(buoy instanceof BuoySpec)) {
+							buoy = null;
 							buoy = new BuoySpec(dia, n);
 						}
@@ -875,4 +882,5 @@
 					case SeaMark.LIGHT:
 						if (!(buoy instanceof BuoyNota)) {
+							buoy = null;
 							buoy = new BuoyNota(dia, n);
 							buoy.setBuoyIndex(0);
@@ -881,5 +889,4 @@
 					}
 
-					buoy.refreshStyles();
 					buoy.refreshLights();
 					buoy.setLightColour();
Index: /applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoyCard.java
===================================================================
--- /applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoyCard.java	(revision 23409)
+++ /applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoyCard.java	(revision 23410)
@@ -142,5 +142,5 @@
 	}
 
-	public void refreshLights() {
+		public void refreshLights() {
 		dlg.cbM01Kennung.removeAllItems();
 		dlg.cbM01Kennung.addItem(Messages.getString("SmpDialogAction.212")); //$NON-NLS-1$