diff --git a/owrx/kiss.py b/owrx/kiss.py
index be3a608..2ef4624 100644
--- a/owrx/kiss.py
+++ b/owrx/kiss.py
@@ -60,8 +60,10 @@ IGLOGIN {callsign} {password}
                 offset  = "OFFSET=" + str(pm["aprs_igate_offset"]) if "aprs_igate_offset"  in pm else ""
                 comment = str(pm["aprs_igate_comment"])            if "aprs_igate_comment" in pm else "\"OpenWebRX APRS gateway\""
 
-                if(comment[0] != '"' or comment[len(comment)-1] != '"'):
+                if(len(comment) > 0 and ((comment[0] != '"') or (comment[len(comment)-1] != '"')))):
+                    logger.info(comment)
                     comment = "\"" + comment + "\""
+                    logger.info(comment)
 
                 pbeacon= "PBEACON sendto=IG delay=0:30 every=60:00 symbol={symbol} lat={lat} long={lon} POWER={power} {height} {gain} {adir} {freq} {tone} {offset} comment={comment}".format(
                     symbol=symbol, lat=lat, lon=lon, power=power, height=height, gain=gain, adir=adir, freq=freq, tone=tone, offset=offset, comment=comment )