diff --git a/ChangeLog b/ChangeLog
index b7b59cae..f0338f54 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -18457,3 +18457,6 @@
 2019-02-05 Fred Gleason <fredg@paravelsystems.com>
 	* Added a Maintainer's Note to the 'MainObject::SchemaMap()'
 	method in rddbmgr(8).
+2019-02-05 Fred Gleason <fredg@paravelsystems.com>
+	* Fixed a bug in rdairplay(1) that threw a segfault when processing
+	a null RML.
diff --git a/lib/rdripc.cpp b/lib/rdripc.cpp
index d3c4bb6d..aae4dd61 100644
--- a/lib/rdripc.cpp
+++ b/lib/rdripc.cpp
@@ -240,6 +240,10 @@ void RDRipc::DispatchCommand()
 
   //  printf("RDRipc::DispatchCommand: %s\n",(const char *)ripc_accum.toUtf8());
   QStringList cmds=ripc_accum.split(" ",QString::SkipEmptyParts);
+
+  if(cmds.size()==0) {
+    return;
+  }
   
   if(cmds[0]=="PW") {  // Password Response
     SendCommand("RU!");