/* Look up the ELS command IOCB and create pseudo response IOCB */
        cmdiocbq = lpfc_sli_iocbq_lookup_by_tag(phba, pring,
                                bf_get(lpfc_wcqe_c_request_tag, wcqe));
-       /* Put the iocb back on the txcmplq */
-       lpfc_sli_ringtxcmpl_put(phba, pring, cmdiocbq);
-       spin_unlock_irqrestore(&pring->ring_lock, iflags);
-
        if (unlikely(!cmdiocbq)) {
+               spin_unlock_irqrestore(&pring->ring_lock, iflags);
                lpfc_printf_log(phba, KERN_WARNING, LOG_SLI,
                                "0386 ELS complete with no corresponding "
-                               "cmdiocb: iotag (%d)\n",
-                               bf_get(lpfc_wcqe_c_request_tag, wcqe));
+                               "cmdiocb: 0x%x 0x%x 0x%x 0x%x\n",
+                               wcqe->word0, wcqe->total_data_placed,
+                               wcqe->parameter, wcqe->word3);
                lpfc_sli_release_iocbq(phba, irspiocbq);
                return NULL;
        }
 
+       /* Put the iocb back on the txcmplq */
+       lpfc_sli_ringtxcmpl_put(phba, pring, cmdiocbq);
+       spin_unlock_irqrestore(&pring->ring_lock, iflags);
+
        /* Fake the irspiocbq and copy necessary response information */
        lpfc_sli4_iocb_param_transfer(phba, irspiocbq, cmdiocbq, wcqe);
 
        if (pcmd && pcmd->virt)
                dma_pool_free(phba->lpfc_drb_pool, pcmd->virt, pcmd->phys);
        kfree(pcmd);
-       lpfc_sli_release_iocbq(phba, iocbq);
+       if (iocbq)
+               lpfc_sli_release_iocbq(phba, iocbq);
        lpfc_in_buf_free(phba, &dmabuf->dbuf);
 }