diff --git a/modules/weather/weather.js b/modules/weather/weather.js
index 58ce0b8..f7e50ec 100644
--- a/modules/weather/weather.js
+++ b/modules/weather/weather.js
@@ -20,7 +20,7 @@ var weather = function(dbot) {
                 'json': true
             }, function(err, response, body) {
                 if(!err && body && _.has(body, 'cod') && body.cod === 200) {
-                    event.reply('['+body.name+', '+body.sys.country+']' + ' Condition: ' + body.weather[0].description + ' | Temp: ' + Math.round(body.main.temp) + 'C/'+Math.round(body.main.temp* 9 / 5 + 32)+'F | Humidity: ' + body.main.humidity + '% | Wind Speed: ' + body.wind.speed + 'KM/H');
+                    event.reply('['+(body.name ? body.name +', ':'')+body.sys.country+']' + ' Condition: ' + body.weather[0].description + ' | Temp: ' + Math.round(body.main.temp) + 'C/'+Math.round(body.main.temp* 9 / 5 + 32)+'F | Humidity: ' + body.main.humidity + '% | Wind Speed: ' + body.wind.speed + 'KM/H');
                 } else {
                     event.reply('There is no weather in ' + city);
                 }