diff --git a/ChangeLog b/ChangeLog
index a858a27b..8796d16c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -19903,3 +19903,9 @@
 	lists.
 2020-06-19 Fred Gleason <fredg@paravelsystems.com>
 	* Removed the 'Q3PopupMenu' dependency from rdlogmanager(1).
+2020-06-23 Fred Gleason <fredg@paravelsystems.com>
+	* Fixed a bug in the 'Add Next' ['PX'] RML that failed to return an
+	error when an invalid offset value was supplied.
+	* Fixed a bug in the 'Add Next' ['PX'] RML that failed to honor
+	the 'Default Trans. Type' setting in the 'Configure RDAirPlay'
+	dialog in rdadmin(1).
diff --git a/rdairplay/local_macros.cpp b/rdairplay/local_macros.cpp
index 9d9962d3..d297daaf 100644
--- a/rdairplay/local_macros.cpp
+++ b/rdairplay/local_macros.cpp
@@ -2,7 +2,7 @@
 //
 // Local RML Macros for the Rivendell's RDAirPlay
 //
-//   (C) Copyright 2002-2018 Fred Gleason <fredg@paravelsystems.com>
+//   (C) Copyright 2002-2020 Fred Gleason <fredg@paravelsystems.com>
 //
 //   This program is free software; you can redistribute it and/or modify
 //   it under the terms of the GNU General Public License version 2 as
@@ -44,6 +44,8 @@ void MainWidget::RunLocalMacros(RDMacro *rml)
   int mach=0;
   RDLogLine::TransType trans=RDLogLine::Play;
   int offset=0;
+  bool ok=false;
+  unsigned cart=0;
 
   if(rml->role()!=RDMacro::Cmd) {
     return;
@@ -792,7 +794,11 @@ void MainWidget::RunLocalMacros(RDMacro *rml)
       }
       return;
     }
-    if((rml->arg(0).toInt()<1)||(rml->arg(0).toInt()>3)||
+    mach=rml->arg(0).toInt();
+    cart=cart;
+    offset=0;
+    trans=air_default_trans_type;
+    if((mach<1)||(mach>3)||
        (rml->arg(1).toUInt()>999999)) {
       if(rml->echoRequested()) {
 	rml->acknowledge(false);
@@ -800,30 +806,46 @@ void MainWidget::RunLocalMacros(RDMacro *rml)
       }
       return;
     }
-    offset=0;
     if(rml->argQuantity()>=3) {
-      offset=rml->arg(2).toInt();
+      offset=rml->arg(2).toInt(&ok);
+      if(!ok) {
+	if(rml->echoRequested()) {
+	  rml->acknowledge(false);
+	  rda->ripc()->sendRml(rml);
+	}
+	return;
+      }
     }
-    trans=RDLogLine::Play;
     if(rml->argQuantity()==4) {
+      trans=RDLogLine::NoTrans;
+      if(rml->arg(3).toLower()=="play") {
+	trans=RDLogLine::Play;
+      }
       if(rml->arg(3).toLower()=="segue") {
 	trans=RDLogLine::Segue;
       }
       if(rml->arg(3).toLower()=="stop") {
 	trans=RDLogLine::Stop;
       }
+      if(trans==RDLogLine::NoTrans) {
+	if(rml->echoRequested()) {
+	  rml->acknowledge(false);
+	  rda->ripc()->sendRml(rml);
+	}
+	return;
+      }
     }
-    if(air_log[rml->arg(0).toInt()-1]->nextLine()>=0) {
-      air_log[rml->arg(0).toInt()-1]->
-	insert(air_log[rml->arg(0).toInt()-1]->nextLine()+offset,
+    if(air_log[mach-1]->nextLine()>=0) {
+      air_log[mach-1]->
+	insert(air_log[mach-1]->nextLine()+offset,
 	       rml->arg(1).toUInt(),RDLogLine::NoTrans,trans);
     }
     else {
-      air_log[rml->arg(0).toInt()-1]->
-	insert(air_log[rml->arg(0).toInt()-1]->size(),
+      air_log[mach-1]->
+	insert(air_log[mach-1]->size(),
 	       rml->arg(1).toUInt(),RDLogLine::NoTrans,trans);
-      air_log[rml->arg(0).toInt()-1]->
-	makeNext(air_log[rml->arg(0).toInt()-1]->size()-1);
+      air_log[mach-1]->
+	makeNext(air_log[mach-1]->size()-1);
     }
     if(rml->echoRequested()) {
       rml->acknowledge(true);
diff --git a/rdairplay/rdairplay.cpp b/rdairplay/rdairplay.cpp
index 21992d32..8405774b 100644
--- a/rdairplay/rdairplay.cpp
+++ b/rdairplay/rdairplay.cpp
@@ -191,6 +191,7 @@ MainWidget::MainWidget(RDConfig *config,QWidget *parent)
   //
   rdairplay_previous_exit_code=rda->airplayConf()->exitCode();
   rda->airplayConf()->setExitCode(RDAirPlayConf::ExitDirty);
+  air_default_trans_type=rda->airplayConf()->defaultTransType();
   air_clear_filter=rda->airplayConf()->clearFilter();
   air_bar_action=rda->airplayConf()->barAction();
   air_op_mode_style=rda->airplayConf()->opModeStyle();
diff --git a/rdairplay/rdairplay.h b/rdairplay/rdairplay.h
index a6c3a1de..7e99402b 100644
--- a/rdairplay/rdairplay.h
+++ b/rdairplay/rdairplay.h
@@ -161,6 +161,7 @@ class MainWidget : public RDWidget
   int air_meter_port[3];
   int air_cue_card;
   int air_cue_port;
+  RDLogLine::TransType air_default_trans_type;
   RDInstanceLock *air_lock;
   bool air_clear_filter;
   RDAirPlayConf::BarAction air_bar_action;