1 files changed, 6 insertions, 0 deletions
diff --git a/ext/pdo_dblib/dblib_driver.c b/ext/pdo_dblib/dblib_driver.c
index 13ddd8a472..3e0529fa1d 100644
--- a/ext/pdo_dblib/dblib_driver.c
+++ b/ext/pdo_dblib/dblib_driver.c
@@ -57,6 +57,11 @@ static int dblib_fetch_error(pdo_dbh_t *dbh, pdo_stmt_t *stmt, zval *info)
 		msg = einfo->dberrstr;
 	}
 
+	/* don't return anything if there's nothing to return */
+	if (msg == NULL && einfo->dberr == 0 && einfo->oserr == 0 && einfo->severity == 0) {
+		return 0;
+	}
+
 	spprintf(&message, 0, "%s [%d] (severity %d) [%s]",
 		msg, einfo->dberr, einfo->severity, stmt ? stmt->active_query_string : "");
 
@@ -88,6 +93,7 @@ static int dblib_handle_closer(pdo_dbh_t *dbh)
 		}
 		pefree(H, dbh->is_persistent);
 		dbh->driver_data = NULL;
+		pdo_dblib_err_dtor(&H->err);
 	}
 	return 0;
 }