diff -rupN org.eclipse.paho.client.eclipse.view/bin/org/eclipse/paho/client/eclipse/view/messages.properties /Users/eurotech/Desktop/tmp/org.eclipse.paho.client.eclipse.view/bin/org/eclipse/paho/client/eclipse/view/messages.properties
--- org.eclipse.paho.client.eclipse.view/bin/org/eclipse/paho/client/eclipse/view/messages.properties	2013-03-28 05:14:24.000000000 -0700
+++ /Users/eurotech/Desktop/tmp/org.eclipse.paho.client.eclipse.view/bin/org/eclipse/paho/client/eclipse/view/messages.properties	2013-04-18 12:04:41.000000000 -0700
@@ -9,6 +9,7 @@ MqttClientView_106=QoS: 
 MqttClientView_11=Subscribe and unsubscribe to topics
 MqttClientView_110=Subscribe
 MqttClientView_111=Unsubscribe
+MqttClientView_12=Error publishing: Please enter a valid topic to publish on.
 MqttClientView_15=Error connecting to 
 MqttClientView_16=, please enter a valid client ID.
 MqttClientView_17=Failed to connect to broker: 
diff -rupN org.eclipse.paho.client.eclipse.view/src/org/eclipse/paho/client/eclipse/view/Messages.java /Users/eurotech/Desktop/tmp/org.eclipse.paho.client.eclipse.view/src/org/eclipse/paho/client/eclipse/view/Messages.java
--- org.eclipse.paho.client.eclipse.view/src/org/eclipse/paho/client/eclipse/view/Messages.java	2013-03-28 05:14:24.000000000 -0700
+++ /Users/eurotech/Desktop/tmp/org.eclipse.paho.client.eclipse.view/src/org/eclipse/paho/client/eclipse/view/Messages.java	2013-04-18 12:05:03.000000000 -0700
@@ -13,6 +13,7 @@ public class Messages extends NLS {
 	public static String MqttClientView_105;
 	public static String MqttClientView_106;
 	public static String MqttClientView_11;
+	public static String MqttClientView_12;
 	public static String MqttClientView_110;
 	public static String MqttClientView_111;
 	public static String MqttClientView_15;
diff -rupN org.eclipse.paho.client.eclipse.view/src/org/eclipse/paho/client/eclipse/view/MqttClientView.java /Users/eurotech/Desktop/tmp/org.eclipse.paho.client.eclipse.view/src/org/eclipse/paho/client/eclipse/view/MqttClientView.java
--- org.eclipse.paho.client.eclipse.view/src/org/eclipse/paho/client/eclipse/view/MqttClientView.java	2013-03-28 05:14:24.000000000 -0700
+++ /Users/eurotech/Desktop/tmp/org.eclipse.paho.client.eclipse.view/src/org/eclipse/paho/client/eclipse/view/MqttClientView.java	2013-04-18 12:24:05.000000000 -0700
@@ -19,6 +19,7 @@ import java.io.InputStream;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
+import org.eclipse.paho.client.mqttv3.IMqttDeliveryToken;
 import org.eclipse.paho.client.mqttv3.MqttCallback;
 import org.eclipse.paho.client.mqttv3.MqttClient;
 import org.eclipse.paho.client.mqttv3.MqttConnectOptions;
@@ -29,6 +30,7 @@ import org.eclipse.paho.client.mqttv3.Mq
 import org.eclipse.paho.client.mqttv3.MqttTopic;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.SashForm;
+import org.eclipse.swt.custom.ScrolledComposite;
 import org.eclipse.swt.events.ModifyEvent;
 import org.eclipse.swt.events.ModifyListener;
 import org.eclipse.swt.events.SelectionAdapter;
@@ -396,6 +398,8 @@ public class MqttClientView extends View
 				e.printStackTrace();
 			} catch (MqttException e) {
 				e.printStackTrace();
+			} catch (IllegalArgumentException e) {
+				out(Messages.MqttClientView_12);
 			}
 		}
 	}
@@ -459,11 +463,12 @@ public class MqttClientView extends View
 		connected = true;
 		syncOut(getDate() + Messages.MqttClientView_50 + clientId);
 	}
-
+	
+	@Override
 	/**
 	 * Logs a message that has arrived from the broker
 	 */
-	public void messageArrived(MqttTopic topic, MqttMessage message)
+	public void messageArrived(String topic, MqttMessage message)
 			throws Exception {
 		syncOut(getDate() + Messages.MqttClientView_51);
 		syncOut(Messages.MqttClientView_52 + topic + "\""); //$NON-NLS-2$
@@ -524,7 +529,7 @@ public class MqttClientView extends View
 	private Control getConnectionControl(TabFolder tabFolder) {
 		Composite composite = new Composite(tabFolder, SWT.NONE);
 		composite.setLayout(new FillLayout(SWT.VERTICAL));
-		
+
 		// Connection group
 		connectionGroup = new Group(composite, SWT.NONE);
 	    connectionGroup.setLayout(new GridLayout(2, false));
@@ -835,5 +840,11 @@ public class MqttClientView extends View
         is.close();
         
         return bytes;
-    }
+    }
+
+	@Override
+	public void deliveryComplete(IMqttDeliveryToken token) {
+		// TODO Auto-generated method stub
+		
+	}
 }
diff -rupN org.eclipse.paho.client.eclipse.view/src/org/eclipse/paho/client/eclipse/view/messages.properties /Users/eurotech/Desktop/tmp/org.eclipse.paho.client.eclipse.view/src/org/eclipse/paho/client/eclipse/view/messages.properties
--- org.eclipse.paho.client.eclipse.view/src/org/eclipse/paho/client/eclipse/view/messages.properties	2013-03-28 05:14:24.000000000 -0700
+++ /Users/eurotech/Desktop/tmp/org.eclipse.paho.client.eclipse.view/src/org/eclipse/paho/client/eclipse/view/messages.properties	2013-04-18 12:04:41.000000000 -0700
@@ -9,6 +9,7 @@ MqttClientView_106=QoS: 
 MqttClientView_11=Subscribe and unsubscribe to topics
 MqttClientView_110=Subscribe
 MqttClientView_111=Unsubscribe
+MqttClientView_12=Error publishing: Please enter a valid topic to publish on.
 MqttClientView_15=Error connecting to 
 MqttClientView_16=, please enter a valid client ID.
 MqttClientView_17=Failed to connect to broker: