diff --git a/src/org/april/hebdobot/model/Hebdobot.java b/src/org/april/hebdobot/model/Hebdobot.java
index 8f8dae4..9d9be10 100644
--- a/src/org/april/hebdobot/model/Hebdobot.java
+++ b/src/org/april/hebdobot/model/Hebdobot.java
@@ -202,7 +202,7 @@ public class Hebdobot extends PircBot
      */
     public void notifyTwitter(final String message)
     {
-        if (this.twitterSettings.isValid())
+        if ((this.twitterSettings.isValid()) && (StringUtils.isNotBlank(message)))
         {
             try
             {
diff --git a/src/org/april/hebdobot/twitter/TwitterClient.java b/src/org/april/hebdobot/twitter/TwitterClient.java
index 89f05aa..b8c0f5e 100644
--- a/src/org/april/hebdobot/twitter/TwitterClient.java
+++ b/src/org/april/hebdobot/twitter/TwitterClient.java
@@ -89,16 +89,23 @@ public class TwitterClient
      */
     public void tweet(final String message) throws TwitterException
     {
-        ConfigurationBuilder config = new ConfigurationBuilder();
-        config.setDebugEnabled(true);
-        config.setOAuthConsumerKey(this.consumerKey);
-        config.setOAuthConsumerSecret(this.consumerSecret);
-        config.setOAuthAccessToken(this.accessToken);
-        config.setOAuthAccessTokenSecret(this.accessTokenSecret);
+        if (StringUtils.isBlank(message))
+        {
+            logger.info("Empty message => tweet aborted.");
+        }
+        else
+        {
+            ConfigurationBuilder config = new ConfigurationBuilder();
+            config.setDebugEnabled(true);
+            config.setOAuthConsumerKey(this.consumerKey);
+            config.setOAuthConsumerSecret(this.consumerSecret);
+            config.setOAuthAccessToken(this.accessToken);
+            config.setOAuthAccessTokenSecret(this.accessTokenSecret);
 
-        Twitter twitter = new TwitterFactory(config.build()).getInstance();
+            Twitter twitter = new TwitterFactory(config.build()).getInstance();
 
-        Status status = twitter.updateStatus(message);
-        logger.info("Tweet result [" + status.getText() + "].");
+            Status status = twitter.updateStatus(message);
+            logger.info("Tweet result [" + status.getText() + "].");
+        }
     }
 }