diff --git a/src/plugins/switch/nrt/nrt.c b/src/plugins/switch/nrt/nrt.c
index 80ba18d9f423b18f62d160ba88fa6cd590e2a82c..9c34edf03c32b04cbf539d940340dcfc6bc580ec 100644
--- a/src/plugins/switch/nrt/nrt.c
+++ b/src/plugins/switch/nrt/nrt.c
@@ -1209,7 +1209,6 @@ _allocate_window_single(char *adapter_name, slurm_nrt_jobinfo_t *jp,
 					     "on node %s adapter %s",
 					     node->name,
 					     adapter->adapter_name);
-					/* FIXME: Should we retry job step? */
 					return SLURM_ERROR;
 				}
 				adapter->immed_slots_used += jp->immed_slots;
@@ -1221,7 +1220,6 @@ _allocate_window_single(char *adapter_name, slurm_nrt_jobinfo_t *jp,
 					     adapter->adapter_name);
 					adapter->immed_slots_used -=
 						jp->immed_slots;
-					/* FIXME: Should we retry job step? */
 					return SLURM_ERROR;
 				}
 				window->state = NRT_WIN_UNAVAILABLE;
@@ -2784,7 +2782,9 @@ fail:
 	free(host);
 	hostlist_iterator_destroy(hi);
 	xfree(protocol_table);
-	/* slurmctld will call nrt_free_jobinfo on jp */
+	(void) nrt_job_step_complete(jp, hl);	/* Release resources already
+						 * allocated */
+	/* slurmctld will call nrt_free_jobinfo(jp) to free memory */
 	return SLURM_FAILURE;
 }
 
diff --git a/src/slurmctld/step_mgr.c b/src/slurmctld/step_mgr.c
index 52d36418944f684d4f95a09b2316b53c5b93836a..27582c928aa4bd0bad7b2249d94dffd2186ab7e9 100644
--- a/src/slurmctld/step_mgr.c
+++ b/src/slurmctld/step_mgr.c
@@ -2054,7 +2054,6 @@ step_create(job_step_create_request_msg_t *step_specs,
 					 step_ptr->step_layout->tasks,
 					 step_ptr->step_layout->tids,
 					 step_ptr->network) < 0) {
-			error("switch_build_jobinfo: %m");
 			delete_step_record (job_ptr, step_ptr->step_id);
 			return ESLURM_INTERCONNECT_FAILURE;
 		}