tests & fixes

[m6w6/ext-pq] / src / php_pq.c

diff --git a/src/php_pq.c b/src/php_pq.c
index 01886ce983d67ad0a6c7a5b4204555b4d189568e..a0d18a510023f7aa5944ad106f447ded84392ea6 100644 (file)
--- a/src/php_pq.c
+++ b/src/php_pq.c
@@ -49,8 +49,12 @@ static int php_pqconn_event(PGEventId id, void *e, void *data);
 
 #define PHP_PQclear(_r) \
        do { \
-               zval *_resinszv = PQresultInstanceData((_r), php_pqconn_event); \
-               if (!_resinszv) PQclear((_r)); \
+               php_pqres_object_t *_o = PQresultInstanceData((_r), php_pqconn_event); \
+               if (_o) { \
+                       php_pq_object_delref(_o TSRMLS_CC); \
+               } else { \
+                       PQclear(_r); \
+               } \
        } while (0)
 
 /*
@@ -89,35 +93,59 @@ static zend_class_entry *php_pqlob_class_entry;
 static zend_class_entry *php_pqcopy_class_entry;
 
 typedef enum php_pqexc_type {
-       EX_DEFAULT,
        EX_INVALID_ARGUMENT,
        EX_RUNTIME,
        EX_CONNECTION_FAILED,
+       EX_IO,
+       EX_ESCAPE,
        EX_BAD_METHODCALL,
+       EX_UNINITIALIZED,
+       EX_DOMAIN,
+       EX_SQL
 } php_pqexc_type_t;
 
 static zend_class_entry *php_pqexc_interface_class_entry;
-static zend_class_entry *php_pqexc_default_class_entry;
 static zend_class_entry *php_pqexc_invalid_argument_class_entry;
 static zend_class_entry *php_pqexc_runtime_class_entry;
 static zend_class_entry *php_pqexc_bad_methodcall_class_entry;
+static zend_class_entry *php_pqexc_domain_class_entry;
 
 static zend_class_entry *exce(php_pqexc_type_t type)
 {
        switch (type) {
-       case EX_DEFAULT:
        default:
-               return php_pqexc_default_class_entry;
        case EX_INVALID_ARGUMENT:
                return php_pqexc_invalid_argument_class_entry;
        case EX_RUNTIME:
        case EX_CONNECTION_FAILED:
+       case EX_IO:
+       case EX_ESCAPE:
                return php_pqexc_runtime_class_entry;
+       case EX_UNINITIALIZED:
        case EX_BAD_METHODCALL:
                return php_pqexc_bad_methodcall_class_entry;
+       case EX_DOMAIN:
+       case EX_SQL:
+               return php_pqexc_domain_class_entry;
        }
 }
 
+static zval *throw_exce(php_pqexc_type_t type TSRMLS_DC, const char *fmt, ...)
+{
+       char *msg;
+       zval *zexc;
+       va_list argv;
+
+       va_start(argv, fmt);
+       vspprintf(&msg, 0, fmt, argv);
+       va_end(argv);
+
+       zexc = zend_throw_exception(exce(type), msg, type TSRMLS_CC);
+       efree(msg);
+
+       return zexc;
+}
+
 static zend_object_handlers php_pqconn_object_handlers;
 static zend_object_handlers php_pqtypes_object_handlers;
 static zend_object_handlers php_pqres_object_handlers;
@@ -255,8 +283,8 @@ typedef struct php_pqcancel_object {
 
 typedef struct php_pqevent {
        php_pq_callback_t cb;
-       php_pqconn_object_t *conn;
        char *type;
+       ulong h;
 } php_pqevent_t;
 
 typedef struct php_pqevent_object {
@@ -368,10 +396,14 @@ static STATUS php_pqres_iterator_valid(zend_object_iterator *i TSRMLS_DC)
        php_pqres_iterator_t *iter = (php_pqres_iterator_t *) i;
        php_pqres_object_t *obj = zend_object_store_get_object(iter->zi.data TSRMLS_CC);
 
-       if (PQresultStatus(obj->intern->res) != PGRES_TUPLES_OK) {
-               return FAILURE;
-       }
-       if (PQntuples(obj->intern->res) <= iter->index) {
+       switch (PQresultStatus(obj->intern->res)) {
+       case PGRES_TUPLES_OK:
+       case PGRES_SINGLE_TUPLE:
+               if (PQntuples(obj->intern->res) <= iter->index) {
+                       return FAILURE;
+               }
+               break;
+       default:
                return FAILURE;
        }
 
@@ -501,17 +533,54 @@ static int php_pqres_count_elements(zval *object, long *count TSRMLS_DC)
 
 static STATUS php_pqres_success(PGresult *res TSRMLS_DC)
 {
+       zval *zexc;
+
        switch (PQresultStatus(res)) {
        case PGRES_BAD_RESPONSE:
        case PGRES_NONFATAL_ERROR:
        case PGRES_FATAL_ERROR:
-               zend_throw_exception_ex(exce(EX_RUNTIME), EX_RUNTIME TSRMLS_CC, "%s", PHP_PQresultErrorMessage(res));
+               zexc = throw_exce(EX_SQL TSRMLS_CC, "%s", PHP_PQresultErrorMessage(res));
+               zend_update_property_string(php_pqexc_domain_class_entry, zexc, ZEND_STRL("sqlstate"), PQresultErrorField(res, PG_DIAG_SQLSTATE) TSRMLS_CC);
                return FAILURE;
        default:
                return SUCCESS;
        }
 }
 
+/*
+static void php_pqconn_del_eventhandler(php_pqconn_object_t *obj, const char *type_str, size_t type_len, ulong id TSRMLS_DC)
+{
+       zval **evhs;
+
+       if (SUCCESS == zend_hash_find(&obj->intern->eventhandlers, type_str, type_len + 1, (void *) &evhs)) {
+               zend_hash_index_del(Z_ARRVAL_PP(evhs), id);
+       }
+}
+*/
+
+static ulong php_pqconn_add_eventhandler(php_pqconn_object_t *obj, const char *type_str, size_t type_len, zval *zevent TSRMLS_DC)
+{
+       zval **evhs;
+       ulong h;
+
+       if (SUCCESS == zend_hash_find(&obj->intern->eventhandlers, type_str, type_len + 1, (void *) &evhs)) {
+               Z_ADDREF_P(zevent);
+               h = zend_hash_next_free_element(Z_ARRVAL_PP(evhs));
+               add_next_index_zval(*evhs, zevent);
+       } else {
+               zval *evh;
+
+               MAKE_STD_ZVAL(evh);
+               array_init(evh);
+               Z_ADDREF_P(zevent);
+               h = zend_hash_next_free_element(Z_ARRVAL_P(evh));
+               add_next_index_zval(evh, zevent);
+               zend_hash_add(&obj->intern->eventhandlers, type_str, type_len + 1, (void *) &evh, sizeof(zval *), NULL);
+       }
+
+       return h;
+}
+
 static void php_pq_callback_dtor(php_pq_callback_t *cb) {
        if (cb->fci.size > 0) {
                zend_fcall_info_args_clear(&cb->fci, 1);
@@ -545,6 +614,20 @@ static void php_pq_object_to_zval(void *o, zval **zv TSRMLS_DC)
        (*zv)->value.obj = obj->zv;
 }
 
+static void php_pq_object_to_zval_no_addref(void *o, zval **zv TSRMLS_DC)
+{
+       php_pq_object_t *obj = o;
+
+       if (!*zv) {
+               MAKE_STD_ZVAL(*zv);
+       }
+
+       /* no add ref */
+
+       (*zv)->type = IS_OBJECT;
+       (*zv)->value.obj = obj->zv;
+}
+
 static void php_pq_object_addref(void *o TSRMLS_DC)
 {
        php_pq_object_t *obj = o;
@@ -560,7 +643,9 @@ static void php_pq_object_delref(void *o TSRMLS_DC)
 static void php_pqconn_object_free(void *o TSRMLS_DC)
 {
        php_pqconn_object_t *obj = o;
-
+#if DBG_GC
+       fprintf(stderr, "FREE conn(#%d) %p\n", obj->zv.handle, obj);
+#endif
        if (obj->intern) {
                php_resource_factory_handle_dtor(&obj->intern->factory, obj->intern->conn TSRMLS_CC);
                php_resource_factory_dtor(&obj->intern->factory);
@@ -577,7 +662,9 @@ static void php_pqconn_object_free(void *o TSRMLS_DC)
 static void php_pqtypes_object_free(void *o TSRMLS_DC)
 {
        php_pqtypes_object_t *obj = o;
-
+#if DBG_GC
+       fprintf(stderr, "FREE types(#%d) %p (conn(#%d): %p)\n", obj->zv.handle, obj, obj->intern->conn->zv.handle, obj->intern->conn);
+#endif
        if (obj->intern) {
                zend_hash_destroy(&obj->intern->types);
                php_pq_object_delref(obj->intern->conn TSRMLS_CC);
@@ -591,19 +678,14 @@ static void php_pqtypes_object_free(void *o TSRMLS_DC)
 static void php_pqres_object_free(void *o TSRMLS_DC)
 {
        php_pqres_object_t *obj = o;
-
+#if DBG_GC
+       fprintf(stderr, "FREE res(#%d) %p\n", obj->zv.handle, obj);
+#endif
        if (obj->intern) {
                if (obj->intern->res) {
-                       zval *res = PQresultInstanceData(obj->intern->res, php_pqconn_event);
-                       if (res) {
-                               if (1 == Z_REFCOUNT_P(res)) {
-                                       PQresultSetInstanceData(obj->intern->res, php_pqconn_event, NULL);
-                               }
-                               zval_ptr_dtor(&res);
-                       } else {
-                               PQclear(obj->intern->res);
-                               obj->intern->res = NULL;
-                       }
+                       PQresultSetInstanceData(obj->intern->res, php_pqconn_event, NULL);
+                       PQclear(obj->intern->res);
+                       obj->intern->res = NULL;
                }
 
                if (obj->intern->iter) {
@@ -623,7 +705,9 @@ static void php_pqres_object_free(void *o TSRMLS_DC)
 static void php_pqstm_object_free(void *o TSRMLS_DC)
 {
        php_pqstm_object_t *obj = o;
-
+#if DBG_GC
+       fprintf(stderr, "FREE stm(#%d) %p (conn(#%d): %p)\n", obj->zv.handle, obj, obj->intern->conn->zv.handle, obj->intern->conn);
+#endif
        if (obj->intern) {
                char *quoted_name = PQescapeIdentifier(obj->intern->conn->intern->conn, obj->intern->name, strlen(obj->intern->name));
 
@@ -657,7 +741,9 @@ static void php_pqstm_object_free(void *o TSRMLS_DC)
 static void php_pqtxn_object_free(void *o TSRMLS_DC)
 {
        php_pqtxn_object_t *obj = o;
-
+#if DBG_GC
+       fprintf(stderr, "FREE txn(#%d) %p (conn(#%d): %p)\n", obj->zv.handle, obj, obj->intern->conn->zv.handle, obj->intern->conn);
+#endif
        if (obj->intern) {
                if (obj->intern->open) {
                        PGresult *res = PQexec(obj->intern->conn->intern->conn, "ROLLBACK");
@@ -677,7 +763,9 @@ static void php_pqtxn_object_free(void *o TSRMLS_DC)
 static void php_pqcancel_object_free(void *o TSRMLS_DC)
 {
        php_pqcancel_object_t *obj = o;
-
+#if DBG_GC
+       fprintf(stderr, "FREE cancel(#%d) %p (conn(#%d): %p)\n", obj->zv.handle, obj, obj->intern->conn->zv.handle, obj->intern->conn);
+#endif
        if (obj->intern) {
                PQfreeCancel(obj->intern->cancel);
                php_pq_object_delref(obj->intern->conn TSRMLS_CC);
@@ -691,10 +779,11 @@ static void php_pqcancel_object_free(void *o TSRMLS_DC)
 static void php_pqevent_object_free(void *o TSRMLS_DC)
 {
        php_pqevent_object_t *obj = o;
-
+#if DBG_GC
+       fprintf(stderr, "FREE event(#%d) %p\n", obj->zv.handle, obj);
+#endif
        if (obj->intern) {
                php_pq_callback_dtor(&obj->intern->cb);
-               php_pq_object_delref(obj->intern->conn TSRMLS_CC);
                efree(obj->intern->type);
                efree(obj->intern);
                obj->intern = NULL;
@@ -706,7 +795,9 @@ static void php_pqevent_object_free(void *o TSRMLS_DC)
 static void php_pqlob_object_free(void *o TSRMLS_DC)
 {
        php_pqlob_object_t *obj = o;
-
+#if DBG_GC
+       fprintf(stderr, "FREE lob(#%d) %p (txn(#%d): %p)\n", obj->zv.handle, obj, obj->intern->txn->zv.handle, obj->intern->txn);
+#endif
        if (obj->intern) {
                if (obj->intern->lofd) {
                        lo_close(obj->intern->txn->intern->conn->intern->conn, obj->intern->lofd);
@@ -722,7 +813,9 @@ static void php_pqlob_object_free(void *o TSRMLS_DC)
 static void php_pqcopy_object_free(void *o TSRMLS_DC)
 {
        php_pqcopy_object_t *obj = o;
-
+#if DBG_GC
+       fprintf(stderr, "FREE copy(#%d) %p (conn(#%d): %p)\n", obj->zv.handle, obj, obj->intern->conn->zv.handle, obj->intern->conn);
+#endif
        if (obj->intern) {
                efree(obj->intern->expression);
                efree(obj->intern->options);
@@ -986,36 +1079,16 @@ static zend_object_value php_pqcopy_create_object(zend_class_entry *class_type T
        return php_pqcopy_create_object_ex(class_type, NULL, NULL TSRMLS_CC);
 }
 
-static int apply_ph_to_debug(void *p TSRMLS_DC, int argc, va_list argv, zend_hash_key *key)
-{
-       php_pq_object_prophandler_t *ph = p;
-       HashTable *ht = va_arg(argv, HashTable *);
-       zval **return_value, *object = va_arg(argv, zval *);
-       php_pq_object_t *obj = va_arg(argv, php_pq_object_t *);
-
-       if (SUCCESS == zend_hash_find(ht, key->arKey, key->nKeyLength, (void *) &return_value)) {
-
-               if (ph->read) {
-                       zval_ptr_dtor(return_value);
-                       MAKE_STD_ZVAL(*return_value);
-                       ZVAL_NULL(*return_value);
-
-                       ph->read(object, obj, *return_value TSRMLS_CC);
-               }
-       }
-
-       return ZEND_HASH_APPLY_KEEP;
-}
-
-static int apply_pi_to_debug(void *p TSRMLS_DC, int argc, va_list argv, zend_hash_key *key)
+static int apply_pi_to_ht(void *p TSRMLS_DC, int argc, va_list argv, zend_hash_key *key)
 {
        zend_property_info *pi = p;
        HashTable *ht = va_arg(argv, HashTable *);
        zval *object = va_arg(argv, zval *);
        php_pq_object_t *obj = va_arg(argv, php_pq_object_t *);
+       int addref = va_arg(argv, int);
        zval *property = zend_read_property(obj->zo.ce, object, pi->name, pi->name_length, 0 TSRMLS_CC);
 
-       if (1||!Z_REFCOUNT_P(property)) {
+       if (addref) {
                Z_ADDREF_P(property);
        }
        zend_hash_add(ht, pi->name, pi->name_length + 1, (void *) &property, sizeof(zval *), NULL);
@@ -1032,8 +1105,7 @@ static HashTable *php_pq_object_debug_info(zval *object, int *temp TSRMLS_DC)
        ALLOC_HASHTABLE(ht);
        ZEND_INIT_SYMTABLE(ht);
 
-       zend_hash_apply_with_arguments(&obj->zo.ce->properties_info TSRMLS_CC, apply_pi_to_debug, 3, ht, object, obj);
-       zend_hash_apply_with_arguments(obj->prophandler TSRMLS_CC, apply_ph_to_debug, 3, ht, object, obj);
+       zend_hash_apply_with_arguments(&obj->zo.ce->properties_info TSRMLS_CC, apply_pi_to_ht, 4, ht, object, obj, 1);
 
        return ht;
 }
@@ -1129,7 +1201,15 @@ static void php_pqconn_object_write_encoding(zval *object, void *o, zval *value
        zval *zenc = value;
 
        if (Z_TYPE_P(value) != IS_STRING) {
-               convert_to_string_ex(&zenc);
+               if (Z_REFCOUNT_P(value) > 1) {
+                       zval *tmp;
+                       MAKE_STD_ZVAL(tmp);
+                       ZVAL_ZVAL(tmp, zenc, 1, 0);
+                       convert_to_string(tmp);
+                       zenc = tmp;
+               } else {
+                       convert_to_string_ex(&zenc);
+               }
        }
 
        if (0 > PQsetClientEncoding(obj->intern->conn, Z_STRVAL_P(zenc))) {
@@ -1155,7 +1235,7 @@ static void php_pqconn_object_write_unbuffered(zval *object, void *o, zval *valu
        obj->intern->unbuffered = zend_is_true(value);
 }
 
-static void php_pqconn_object_read_db(zval *objec, void *o, zval *return_value TSRMLS_DC)
+static void php_pqconn_object_read_db(zval *object, void *o, zval *return_value TSRMLS_DC)
 {
        php_pqconn_object_t *obj = o;
        char *db = PQdb(obj->intern->conn);
@@ -1167,7 +1247,7 @@ static void php_pqconn_object_read_db(zval *objec, void *o, zval *return_value T
        }
 }
 
-static void php_pqconn_object_read_user(zval *objec, void *o, zval *return_value TSRMLS_DC)
+static void php_pqconn_object_read_user(zval *object, void *o, zval *return_value TSRMLS_DC)
 {
        php_pqconn_object_t *obj = o;
        char *user = PQuser(obj->intern->conn);
@@ -1179,7 +1259,7 @@ static void php_pqconn_object_read_user(zval *objec, void *o, zval *return_value
        }
 }
 
-static void php_pqconn_object_read_pass(zval *objec, void *o, zval *return_value TSRMLS_DC)
+static void php_pqconn_object_read_pass(zval *object, void *o, zval *return_value TSRMLS_DC)
 {
        php_pqconn_object_t *obj = o;
        char *pass = PQpass(obj->intern->conn);
@@ -1191,7 +1271,7 @@ static void php_pqconn_object_read_pass(zval *objec, void *o, zval *return_value
        }
 }
 
-static void php_pqconn_object_read_host(zval *objec, void *o, zval *return_value TSRMLS_DC)
+static void php_pqconn_object_read_host(zval *object, void *o, zval *return_value TSRMLS_DC)
 {
        php_pqconn_object_t *obj = o;
        char *host = PQhost(obj->intern->conn);
@@ -1203,7 +1283,7 @@ static void php_pqconn_object_read_host(zval *objec, void *o, zval *return_value
        }
 }
 
-static void php_pqconn_object_read_port(zval *objec, void *o, zval *return_value TSRMLS_DC)
+static void php_pqconn_object_read_port(zval *object, void *o, zval *return_value TSRMLS_DC)
 {
        php_pqconn_object_t *obj = o;
        char *port = PQport(obj->intern->conn);
@@ -1215,7 +1295,7 @@ static void php_pqconn_object_read_port(zval *objec, void *o, zval *return_value
        }
 }
 
-static void php_pqconn_object_read_options(zval *objec, void *o, zval *return_value TSRMLS_DC)
+static void php_pqconn_object_read_options(zval *object, void *o, zval *return_value TSRMLS_DC)
 {
        php_pqconn_object_t *obj = o;
        char *options = PQoptions(obj->intern->conn);
@@ -1227,6 +1307,14 @@ static void php_pqconn_object_read_options(zval *objec, void *o, zval *return_va
        }
 }
 
+static void php_pqconn_object_read_event_handlers(zval *object, void *o, zval *return_value TSRMLS_DC)
+{
+       php_pqconn_object_t *obj = o;
+
+       array_init(return_value);
+       zend_hash_copy(Z_ARRVAL_P(return_value), &obj->intern->eventhandlers, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *));
+}
+
 static void php_pqtypes_object_read_connection(zval *object, void *o, zval *return_value TSRMLS_DC)
 {
        php_pqtypes_object_t *obj = o;
@@ -1234,7 +1322,7 @@ static void php_pqtypes_object_read_connection(zval *object, void *o, zval *retu
        php_pq_object_to_zval(obj->intern->conn, &return_value TSRMLS_CC);
 }
 
-static int has_dimension(HashTable *ht, zval *member, char **key_str, int *key_len, long *index TSRMLS_DC)
+static int has_dimension(HashTable *ht, zval *member, char **key_str, int *key_len, ulong *index TSRMLS_DC)
 {
        long lval = 0;
        zval *tmp = member;
@@ -1245,18 +1333,21 @@ static int has_dimension(HashTable *ht, zval *member, char **key_str, int *key_l
                /* no break */
        case IS_STRING:
                if (!is_numeric_string(Z_STRVAL_P(tmp), Z_STRLEN_P(tmp), &lval, NULL, 0)) {
-                       if (member != tmp) {
-                               zval_ptr_dtor(&tmp);
-                       }
+                       int exists = zend_hash_exists(ht, Z_STRVAL_P(tmp), Z_STRLEN_P(tmp) + 1);
+
                        if (key_str) {
                                *key_str = estrndup(Z_STRVAL_P(tmp), Z_STRLEN_P(tmp));
                                if (key_len) {
                                        *key_len = Z_STRLEN_P(tmp) + 1;
                                }
                        }
-                       return zend_hash_exists(ht, Z_STRVAL_P(tmp), Z_STRLEN_P(tmp) + 1);
+                       if (member != tmp) {
+                               zval_ptr_dtor(&tmp);
+                       }
+
+                       return exists;
                }
-               /* no break */
+               break;
        case IS_LONG:
                lval = Z_LVAL_P(member);
                break;
@@ -1276,7 +1367,7 @@ static int php_pqtypes_object_has_dimension(zval *object, zval *member, int chec
        php_pqtypes_object_t *obj = zend_object_store_get_object(object TSRMLS_CC);
        char *key_str = NULL;
        int key_len = 0;
-       long index = 0;
+       ulong index = 0;
 
        if (check_empty) {
                if (has_dimension(&obj->intern->types, member, &key_str, &key_len, &index TSRMLS_CC)) {
@@ -1289,11 +1380,14 @@ static int php_pqtypes_object_has_dimension(zval *object, zval *member, int chec
                                }
                                efree(key_str);
                        } else {
-                               if (SUCCESS == zend_hash_index_find(&obj->intern->types, index, (void *) data)) {
+                               if (SUCCESS == zend_hash_index_find(&obj->intern->types, index, (void *) &data)) {
                                        return Z_TYPE_PP(data) != IS_NULL;
                                }
                        }
                }
+               if (key_str) {
+                       efree(key_str);
+               }
        } else {
                return has_dimension(&obj->intern->types, member, NULL, NULL, NULL TSRMLS_CC);
        }
@@ -1303,7 +1397,7 @@ static int php_pqtypes_object_has_dimension(zval *object, zval *member, int chec
 
 static zval *php_pqtypes_object_read_dimension(zval *object, zval *member, int type TSRMLS_DC)
 {
-       long index = 0;
+       ulong index = 0;
        char *key_str = NULL;
        int key_len = 0;
        php_pqtypes_object_t *obj = zend_object_store_get_object(object TSRMLS_CC);
@@ -1321,6 +1415,9 @@ static zval *php_pqtypes_object_read_dimension(zval *object, zval *member, int t
                                return *data;
                        }
                }
+               if (key_str) {
+                       efree(key_str);
+               }
        }
 
        return NULL;
@@ -1389,8 +1486,16 @@ static void php_pqres_object_write_fetch_type(zval *object, void *o, zval *value
        php_pqres_object_t *obj = o;
        zval *zfetch_type = value;
 
-       if (Z_TYPE_P(zfetch_type) != IS_LONG) {
-               convert_to_long_ex(&zfetch_type);
+       if (Z_TYPE_P(value) != IS_LONG) {
+               if (Z_REFCOUNT_P(value) > 1) {
+                       zval *tmp;
+                       MAKE_STD_ZVAL(tmp);
+                       ZVAL_ZVAL(tmp, zfetch_type, 1, 0);
+                       convert_to_long(tmp);
+                       zfetch_type = tmp;
+               } else {
+                       convert_to_long_ex(&zfetch_type);
+               }
        }
 
        if (!obj->intern->iter) {
@@ -1436,14 +1541,14 @@ static void php_pqtxn_object_read_readonly(zval *object, void *o, zval *return_v
 {
        php_pqtxn_object_t *obj = o;
 
-       RETVAL_LONG(obj->intern->readonly);
+       RETVAL_BOOL(obj->intern->readonly);
 }
 
 static void php_pqtxn_object_read_deferrable(zval *object, void *o, zval *return_value TSRMLS_DC)
 {
        php_pqtxn_object_t *obj = o;
 
-       RETVAL_LONG(obj->intern->deferrable);
+       RETVAL_BOOL(obj->intern->deferrable);
 }
 
 static void php_pqtxn_object_write_isolation(zval *object, void *o, zval *value TSRMLS_DC)
@@ -1454,18 +1559,26 @@ static void php_pqtxn_object_write_isolation(zval *object, void *o, zval *value
        PGresult *res;
 
        if (Z_TYPE_P(zisolation) != IS_LONG) {
-               convert_to_long_ex(&zisolation);
+               if (Z_REFCOUNT_P(value) > 1) {
+                       zval *tmp;
+                       MAKE_STD_ZVAL(tmp);
+                       ZVAL_ZVAL(tmp, zisolation, 1, 0);
+                       convert_to_long(tmp);
+                       zisolation = tmp;
+               } else {
+                       convert_to_long_ex(&zisolation);
+               }
        }
 
        switch ((obj->intern->isolation = Z_LVAL_P(zisolation))) {
        case PHP_PQTXN_READ_COMMITTED:
-               res = PQexec(obj->intern->conn->intern->conn, "SET TRANSACTION READ COMMITED");
+               res = PQexec(obj->intern->conn->intern->conn, "SET TRANSACTION ISOLATION LEVEL READ COMMITED");
                break;
        case PHP_PQTXN_REPEATABLE_READ:
-               res = PQexec(obj->intern->conn->intern->conn, "SET TRANSACTION REPEATABLE READ");
+               res = PQexec(obj->intern->conn->intern->conn, "SET TRANSACTION ISOLATION LEVEL REPEATABLE READ");
                break;
        case PHP_PQTXN_SERIALIZABLE:
-               res = PQexec(obj->intern->conn->intern->conn, "SET TRANSACTION SERIALIZABLE");
+               res = PQexec(obj->intern->conn->intern->conn, "SET TRANSACTION ISOLATION LEVEL SERIALIZABLE");
                break;
        default:
                obj->intern->isolation = orig;
@@ -1524,13 +1637,6 @@ static void php_pqcancel_object_read_connection(zval *object, void *o, zval *ret
        php_pq_object_to_zval(obj->intern->conn, &return_value TSRMLS_CC);
 }
 
-static void php_pqevent_object_read_connection(zval *object, void *o, zval *return_value TSRMLS_DC)
-{
-       php_pqevent_object_t *obj = o;
-
-       php_pq_object_to_zval(obj->intern->conn, &return_value TSRMLS_CC);
-}
-
 static void php_pqevent_object_read_type(zval *object, void *o, zval *return_value TSRMLS_DC)
 {
        php_pqevent_object_t *obj = o;
@@ -1701,24 +1807,20 @@ static void php_pqconn_event_connreset(PGEventConnReset *event)
        }
 }
 
-static zval *result_instance_zval(PGresult *res TSRMLS_DC)
+static void php_pqres_init_instance_data(PGresult *res, php_pqres_object_t **ptr TSRMLS_DC)
 {
-       zval *rid = PQresultInstanceData(res, php_pqconn_event);
+       php_pqres_object_t *obj;
+       php_pqres_t *r = ecalloc(1, sizeof(*r));
 
-       if (!rid) {
-               php_pqres_t *r = ecalloc(1, sizeof(*r));
+       r->res = res;
+       ZEND_INIT_SYMTABLE(&r->bound);
+       php_pqres_create_object_ex(php_pqres_class_entry, r, &obj TSRMLS_CC);
 
-               MAKE_STD_ZVAL(rid);
-               r->res = res;
-               ZEND_INIT_SYMTABLE(&r->bound);
-               rid->type = IS_OBJECT;
-               rid->value.obj = php_pqres_create_object_ex(php_pqres_class_entry, r, NULL TSRMLS_CC);
+       PQresultSetInstanceData(res, php_pqconn_event, obj);
 
-               PQresultSetInstanceData(res, php_pqconn_event, rid);
+       if (ptr) {
+               *ptr = obj;
        }
-
-       Z_ADDREF_P(rid);
-       return rid;
 }
 
 static void php_pqconn_event_resultcreate(PGEventResultCreate *event)
@@ -1726,17 +1828,21 @@ static void php_pqconn_event_resultcreate(PGEventResultCreate *event)
        php_pqconn_event_data_t *data = PQinstanceData(event->conn, php_pqconn_event);
 
        if (data) {
+               php_pqres_object_t *obj;
                zval **evhs;
                TSRMLS_DF(data);
 
+               php_pqres_init_instance_data(event->result, &obj TSRMLS_CC);
+
                /* event listener */
                if (SUCCESS == zend_hash_find(&data->obj->intern->eventhandlers, ZEND_STRS("result"), (void *) &evhs)) {
-                       zval *args, *connection = NULL, *res = result_instance_zval(event->result TSRMLS_CC);
+                       zval *args, *connection = NULL, *res = NULL;
 
                        MAKE_STD_ZVAL(args);
                        array_init(args);
                        php_pq_object_to_zval(data->obj, &connection TSRMLS_CC);
                        add_next_index_zval(args, connection);
+                       php_pq_object_to_zval(obj, &res TSRMLS_CC);
                        add_next_index_zval(args, res);
                        zend_hash_apply_with_argument(Z_ARRVAL_PP(evhs), apply_event, args TSRMLS_CC);
                        zval_ptr_dtor(&args);
@@ -1744,12 +1850,23 @@ static void php_pqconn_event_resultcreate(PGEventResultCreate *event)
 
                /* async callback */
                if (data->obj->intern->onevent.fci.size > 0) {
-                       zval *res = result_instance_zval(event->result TSRMLS_CC);
+                       zval *res = NULL;
 
+                       php_pq_object_to_zval(obj, &res TSRMLS_CC);
                        zend_fcall_info_argn(&data->obj->intern->onevent.fci TSRMLS_CC, 1, &res);
                        zend_fcall_info_call(&data->obj->intern->onevent.fci, &data->obj->intern->onevent.fcc, NULL, NULL TSRMLS_CC);
                        zval_ptr_dtor(&res);
                }
+
+       }
+}
+
+static void php_pqconn_event_resultdestroy(PGEventResultDestroy *event)
+{
+       php_pqres_object_t *obj = PQresultInstanceData(event->result, php_pqconn_event);
+
+       if (obj) {
+               obj->intern->res = NULL;
        }
 }
 
@@ -1762,6 +1879,9 @@ static int php_pqconn_event(PGEventId id, void *e, void *data)
        case PGEVT_RESULTCREATE:
                php_pqconn_event_resultcreate(e);
                break;
+       case PGEVT_RESULTDESTROY:
+               php_pqconn_event_resultdestroy(e);
+               break;
        default:
                break;
        }
@@ -1888,7 +2008,9 @@ static void php_pqconn_retire(php_persistent_handle_factory_t *f, void **handle
 
        /* cancel async queries */
        if (PQisBusy(*handle) && (cancel = PQgetCancel(*handle))) {
-               PQcancel(cancel, ZEND_STRL("retiring persistent connection"));
+               char err[256] = {0};
+
+               PQcancel(cancel, err, sizeof(err));
                PQfreeCancel(cancel);
        }
        /* clean up async results */
@@ -1939,7 +2061,7 @@ static PHP_METHOD(pqconn, __construct) {
                php_pqconn_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
 
                if (obj->intern) {
-                       zend_throw_exception_ex(exce(EX_BAD_METHODCALL), EX_BAD_METHODCALL TSRMLS_CC, "pq\\Connection already initialized");
+                       throw_exce(EX_BAD_METHODCALL TSRMLS_CC, "pq\\Connection already initialized");
                } else {
                        php_pqconn_event_data_t *evdata =  php_pqconn_event_data_init(obj TSRMLS_CC);
                        php_pqconn_resource_factory_data_t rfdata = {dsn_str, flags};
@@ -1966,7 +2088,7 @@ static PHP_METHOD(pqconn, __construct) {
                        PQsetNoticeReceiver(obj->intern->conn, php_pqconn_notice_recv, evdata);
 
                        if (SUCCESS != php_pqconn_update_socket(getThis(), obj TSRMLS_CC)) {
-                               zend_throw_exception_ex(exce(EX_CONNECTION_FAILED), EX_CONNECTION_FAILED TSRMLS_CC, "Connection failed (%s)", PHP_PQerrorMessage(obj->intern->conn));
+                               throw_exce(EX_CONNECTION_FAILED TSRMLS_CC, "Connection failed (%s)", PHP_PQerrorMessage(obj->intern->conn));
                        }
                }
        }
@@ -1975,39 +2097,54 @@ static PHP_METHOD(pqconn, __construct) {
 ZEND_BEGIN_ARG_INFO_EX(ai_pqconn_reset, 0, 0, 0)
 ZEND_END_ARG_INFO();
 static PHP_METHOD(pqconn, reset) {
-       if (SUCCESS == zend_parse_parameters_none()) {
+       zend_error_handling zeh;
+       STATUS rv;
+
+       zend_replace_error_handling(EH_THROW, exce(EX_INVALID_ARGUMENT), &zeh TSRMLS_CC);
+       rv = zend_parse_parameters_none();
+       zend_restore_error_handling(&zeh TSRMLS_CC);
+
+       if (SUCCESS == rv) {
                php_pqconn_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
 
-               if (obj->intern) {
+               if (!obj->intern) {
+                       throw_exce(EX_UNINITIALIZED TSRMLS_CC, "pq\\Connection not initialized");
+               } else {
                        PQreset(obj->intern->conn);
 
-                       if (CONNECTION_OK == PQstatus(obj->intern->conn)) {
-                               RETURN_TRUE;
-                       } else {
-                               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Connection reset failed: (%s)", PHP_PQerrorMessage(obj->intern->conn));
+                       if (CONNECTION_OK != PQstatus(obj->intern->conn)) {
+                               throw_exce(EX_CONNECTION_FAILED TSRMLS_CC, "Connection reset failed: (%s)", PHP_PQerrorMessage(obj->intern->conn));
                        }
-               } else {
-                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "pq\\Connection not initialized");
+
+                       php_pqconn_notify_listeners(obj TSRMLS_CC);
                }
-               RETURN_FALSE;
        }
 }
 
 ZEND_BEGIN_ARG_INFO_EX(ai_pqconn_reset_async, 0, 0, 0)
 ZEND_END_ARG_INFO();
 static PHP_METHOD(pqconn, resetAsync) {
-       if (SUCCESS == zend_parse_parameters_none()) {
+       zend_error_handling zeh;
+       STATUS rv;
+
+       zend_replace_error_handling(EH_THROW, exce(EX_INVALID_ARGUMENT), &zeh TSRMLS_CC);
+       rv = zend_parse_parameters_none();
+       zend_restore_error_handling(&zeh TSRMLS_CC);
+
+       if (SUCCESS == rv) {
                php_pqconn_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
 
-               if (obj->intern) {
-                       if (PQresetStart(obj->intern->conn)) {
+               if (!obj->intern) {
+                       throw_exce(EX_UNINITIALIZED TSRMLS_CC, "pq\\Connection not initialized");
+               } else {
+                       if (!PQresetStart(obj->intern->conn)) {
+                               throw_exce(EX_IO TSRMLS_CC, "Failed to start connection reset (%s)", PHP_PQerrorMessage(obj->intern->conn));
+                       } else {
                                obj->intern->poller = (int (*)(PGconn*)) PQresetPoll;
-                               RETURN_TRUE;
                        }
-               } else {
-                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "pq\\Connection not initialized");
+
+                       php_pqconn_notify_listeners(obj TSRMLS_CC);
                }
-               RETURN_FALSE;
        }
 }
 
@@ -2031,21 +2168,26 @@ ZEND_BEGIN_ARG_INFO_EX(ai_pqconn_listen, 0, 0, 0)
        ZEND_ARG_INFO(0, callable)
 ZEND_END_ARG_INFO();
 static PHP_METHOD(pqconn, listen) {
+       zend_error_handling zeh;
        char *channel_str = NULL;
        int channel_len = 0;
        php_pq_callback_t listener;
+       STATUS rv;
+
+       zend_replace_error_handling(EH_THROW, exce(EX_INVALID_ARGUMENT), &zeh TSRMLS_CC);
+       rv = zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sf", &channel_str, &channel_len, &listener.fci, &listener.fcc);
+       zend_restore_error_handling(&zeh TSRMLS_CC);
 
-       if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sf", &channel_str, &channel_len, &listener.fci, &listener.fcc)) {
+       if (SUCCESS == rv) {
                php_pqconn_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
 
                if (!obj->intern) {
-                       zend_throw_exception_ex(exce(EX_RUNTIME), EX_RUNTIME TSRMLS_CC, "pq\\Connection not initialized");
+                       throw_exce(EX_UNINITIALIZED TSRMLS_CC, "pq\\Connection not initialized");
                } else {
                        char *quoted_channel = PQescapeIdentifier(obj->intern->conn, channel_str, channel_len);
 
                        if (!quoted_channel) {
-                               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to escape channel identifier (%s)", PHP_PQerrorMessage(obj->intern->conn));
-                               RETVAL_FALSE;
+                               throw_exce(EX_ESCAPE TSRMLS_CC, "Failed to escape channel identifier (%s)", PHP_PQerrorMessage(obj->intern->conn));
                        } else {
                                PGresult *res;
                                smart_str cmd = {0};
@@ -2060,15 +2202,11 @@ static PHP_METHOD(pqconn, listen) {
                                PQfreemem(quoted_channel);
 
                                if (!res) {
-                                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to install listener (%s)", PHP_PQerrorMessage(obj->intern->conn));
-                                       RETVAL_FALSE;
+                                       throw_exce(EX_RUNTIME TSRMLS_CC, "Failed to install listener (%s)", PHP_PQerrorMessage(obj->intern->conn));
                                } else {
-                                       if (SUCCESS != php_pqres_success(res TSRMLS_CC)) {
-                                               RETVAL_FALSE;
-                                       } else {
+                                       if (SUCCESS == php_pqres_success(res TSRMLS_CC)) {
                                                obj->intern->poller = PQconsumeInput;
                                                php_pqconn_add_listener(obj, channel_str, channel_len, &listener TSRMLS_CC);
-                                               RETVAL_TRUE;
                                        }
                                        PHP_PQclear(res);
                                }
@@ -2084,20 +2222,26 @@ ZEND_BEGIN_ARG_INFO_EX(ai_pqconn_listen_async, 0, 0, 0)
        ZEND_ARG_INFO(0, callable)
 ZEND_END_ARG_INFO();
 static PHP_METHOD(pqconn, listenAsync) {
+       zend_error_handling zeh;
        char *channel_str = NULL;
        int channel_len = 0;
        php_pq_callback_t listener;
+       STATUS rv;
+
+       zend_replace_error_handling(EH_THROW, exce(EX_INVALID_ARGUMENT), &zeh TSRMLS_CC);
+       rv = zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sf", &channel_str, &channel_len, &listener.fci, &listener.fcc);
+       zend_restore_error_handling(&zeh TSRMLS_CC);
 
-       if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sf", &channel_str, &channel_len, &listener.fci, &listener.fcc)) {
+       if (SUCCESS == rv) {
                php_pqconn_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
 
                if (!obj->intern) {
-                       zend_throw_exception_ex(exce(EX_RUNTIME), EX_RUNTIME TSRMLS_CC, "pq\\Connection not initialized");
+                       throw_exce(EX_UNINITIALIZED TSRMLS_CC, "pq\\Connection not initialized");
                } else {
                        char *quoted_channel = PQescapeIdentifier(obj->intern->conn, channel_str, channel_len);
 
                        if (!quoted_channel) {
-                               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to escape channel identifier (%s)", PHP_PQerrorMessage(obj->intern->conn));
+                               throw_exce(EX_ESCAPE TSRMLS_CC, "Failed to escape channel identifier (%s)", PHP_PQerrorMessage(obj->intern->conn));
                        } else {
                                smart_str cmd = {0};
 
@@ -2106,16 +2250,15 @@ static PHP_METHOD(pqconn, listenAsync) {
                                smart_str_0(&cmd);
 
                                if (!PQsendQuery(obj->intern->conn, cmd.c)) {
-                                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to install listener (%s)", PHP_PQerrorMessage(obj->intern->conn));
-                                       RETVAL_FALSE;
+                                       throw_exce(EX_IO TSRMLS_CC, "Failed to install listener (%s)", PHP_PQerrorMessage(obj->intern->conn));
                                } else {
                                        obj->intern->poller = PQconsumeInput;
                                        php_pqconn_add_listener(obj, channel_str, channel_len, &listener TSRMLS_CC);
-                                       RETVAL_TRUE;
                                }
 
                                smart_str_free(&cmd);
                                PQfreemem(quoted_channel);
+                               php_pqconn_notify_listeners(obj TSRMLS_CC);
                        }
                }
        }
@@ -2126,14 +2269,20 @@ ZEND_BEGIN_ARG_INFO_EX(ai_pqconn_notify, 0, 0, 2)
        ZEND_ARG_INFO(0, message)
 ZEND_END_ARG_INFO();
 static PHP_METHOD(pqconn, notify) {
+       zend_error_handling zeh;
        char *channel_str, *message_str;
        int channel_len, message_len;
+       STATUS rv;
 
-       if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss", &channel_str, &channel_len, &message_str, &message_len)) {
+       zend_replace_error_handling(EH_THROW, exce(EX_INVALID_ARGUMENT), &zeh TSRMLS_CC);
+       rv = zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss", &channel_str, &channel_len, &message_str, &message_len);
+       zend_restore_error_handling(&zeh TSRMLS_CC);
+
+       if (SUCCESS == rv) {
                php_pqconn_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
 
                if (!obj->intern) {
-                       zend_throw_exception_ex(exce(EX_RUNTIME), EX_RUNTIME TSRMLS_CC, "pq\\Connection not initialized");
+                       throw_exce(EX_UNINITIALIZED TSRMLS_CC, "pq\\Connection not initialized");
                } else {
                        PGresult *res;
                        char *params[2] = {channel_str, message_str};
@@ -2141,14 +2290,9 @@ static PHP_METHOD(pqconn, notify) {
                        res = PQexecParams(obj->intern->conn, "select pg_notify($1, $2)", 2, NULL, (const char *const*) params, NULL, NULL, 0);
 
                        if (!res) {
-                               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to notify listeners (%s)", PHP_PQerrorMessage(obj->intern->conn));
-                               RETVAL_FALSE;
+                               throw_exce(EX_RUNTIME TSRMLS_CC, "Failed to notify listeners (%s)", PHP_PQerrorMessage(obj->intern->conn));
                        } else {
-                               if (SUCCESS != php_pqres_success(res TSRMLS_CC)) {
-                                       RETVAL_FALSE;
-                               } else {
-                                       RETVAL_TRUE;
-                               }
+                               php_pqres_success(res TSRMLS_CC);
                                PHP_PQclear(res);
                        }
 
@@ -2162,23 +2306,27 @@ ZEND_BEGIN_ARG_INFO_EX(ai_pqconn_notify_async, 0, 0, 2)
        ZEND_ARG_INFO(0, message)
 ZEND_END_ARG_INFO();
 static PHP_METHOD(pqconn, notifyAsync) {
+       zend_error_handling zeh;
        char *channel_str, *message_str;
        int channel_len, message_len;
+       STATUS rv;
 
-       if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss", &channel_str, &channel_len, &message_str, &message_len)) {
+       zend_replace_error_handling(EH_THROW, exce(EX_INVALID_ARGUMENT), &zeh TSRMLS_CC);
+       rv = zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss", &channel_str, &channel_len, &message_str, &message_len);
+       zend_restore_error_handling(&zeh TSRMLS_CC);
+
+       if (SUCCESS == rv) {
                php_pqconn_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
 
                if (!obj->intern) {
-                       zend_throw_exception_ex(exce(EX_RUNTIME), EX_RUNTIME TSRMLS_CC, "pq\\Connection not initialized");
+                       throw_exce(EX_UNINITIALIZED TSRMLS_CC, "pq\\Connection not initialized");
                } else {
                        char *params[2] = {channel_str, message_str};
 
                        if (!PQsendQueryParams(obj->intern->conn, "select pg_notify($1, $2)", 2, NULL, (const char *const*) params, NULL, NULL, 0)) {
-                               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to notify listeners (%s)", PHP_PQerrorMessage(obj->intern->conn));
-                               RETVAL_FALSE;
+                               throw_exce(EX_IO TSRMLS_CC, "Failed to notify listeners (%s)", PHP_PQerrorMessage(obj->intern->conn));
                        } else {
                                obj->intern->poller = PQconsumeInput;
-                               RETVAL_TRUE;
                        }
 
                        php_pqconn_notify_listeners(obj TSRMLS_CC);
@@ -2189,19 +2337,28 @@ static PHP_METHOD(pqconn, notifyAsync) {
 ZEND_BEGIN_ARG_INFO_EX(ai_pqconn_poll, 0, 0, 0)
 ZEND_END_ARG_INFO();
 static PHP_METHOD(pqconn, poll) {
-       if (SUCCESS == zend_parse_parameters_none()) {
+       zend_error_handling zeh;
+       STATUS rv;
+
+       zend_replace_error_handling(EH_THROW, exce(EX_INVALID_ARGUMENT), &zeh TSRMLS_CC);
+       rv = zend_parse_parameters_none();
+       zend_restore_error_handling(&zeh TSRMLS_CC);
+
+       if (SUCCESS == rv) {
                php_pqconn_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
 
                if (!obj->intern) {
-                       zend_throw_exception_ex(exce(EX_RUNTIME), EX_RUNTIME TSRMLS_CC, "pq\\Connection not initialized");
+                       throw_exce(EX_UNINITIALIZED TSRMLS_CC, "pq\\Connection not initialized");
                } else if (!obj->intern->poller) {
-                       zend_throw_exception_ex(exce(EX_RUNTIME), EX_RUNTIME TSRMLS_CC, "No asynchronous operation active");
-               } else if (obj->intern->poller == PQconsumeInput) {
-                       RETVAL_LONG(obj->intern->poller(obj->intern->conn) * PGRES_POLLING_OK);
+                       throw_exce(EX_RUNTIME TSRMLS_CC, "No asynchronous operation active");
                } else {
-                       RETVAL_LONG(obj->intern->poller(obj->intern->conn));
+                       if (obj->intern->poller == PQconsumeInput) {
+                               RETVAL_LONG(obj->intern->poller(obj->intern->conn) * PGRES_POLLING_OK);
+                       } else {
+                               RETVAL_LONG(obj->intern->poller(obj->intern->conn));
+                       }
+                       php_pqconn_notify_listeners(obj TSRMLS_CC);
                }
-               php_pqconn_notify_listeners(obj TSRMLS_CC);
        }
 }
 
@@ -2222,19 +2379,16 @@ static PHP_METHOD(pqconn, exec) {
                php_pqconn_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
 
                if (!obj->intern) {
-                       zend_throw_exception_ex(exce(EX_RUNTIME), EX_RUNTIME TSRMLS_CC, "pq\\Connection not initialized");
+                       throw_exce(EX_UNINITIALIZED TSRMLS_CC, "pq\\Connection not initialized");
                } else {
                        PGresult *res = PQexec(obj->intern->conn, query_str);
 
                        if (!res) {
-                               zend_throw_exception_ex(exce(EX_RUNTIME), EX_RUNTIME TSRMLS_CC, "Failed to execute query (%s)", PHP_PQerrorMessage(obj->intern->conn));
+                               throw_exce(EX_RUNTIME TSRMLS_CC, "Failed to execute query (%s)", PHP_PQerrorMessage(obj->intern->conn));
                        } else if (SUCCESS == php_pqres_success(res TSRMLS_CC)) {
-                               php_pqres_t *r = ecalloc(1, sizeof(*r));
-
-                               r->res = res;
-                               ZEND_INIT_SYMTABLE(&r->bound);
-                               return_value->type = IS_OBJECT;
-                               return_value->value.obj = php_pqres_create_object_ex(php_pqres_class_entry, r, NULL TSRMLS_CC);
+                               php_pq_object_to_zval_no_addref(PQresultInstanceData(res, php_pqconn_event), &return_value TSRMLS_CC);
+                       } else {
+                               PHP_PQclear(res);
                        }
 
                        php_pqconn_notify_listeners(obj TSRMLS_CC);
@@ -2245,23 +2399,25 @@ static PHP_METHOD(pqconn, exec) {
 ZEND_BEGIN_ARG_INFO_EX(ai_pqconn_get_result, 0, 0, 0)
 ZEND_END_ARG_INFO();
 static PHP_METHOD(pqconn, getResult) {
-       if (SUCCESS == zend_parse_parameters_none()) {
+       zend_error_handling zeh;
+       STATUS rv;
+
+       zend_replace_error_handling(EH_THROW, exce(EX_INVALID_ARGUMENT), &zeh TSRMLS_CC);
+       rv = zend_parse_parameters_none();
+       zend_restore_error_handling(&zeh TSRMLS_CC);
+
+       if (SUCCESS == rv) {
                php_pqconn_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
 
                if (!obj->intern) {
-                       zend_throw_exception_ex(exce(EX_RUNTIME), EX_RUNTIME TSRMLS_CC, "pq\\Connectio not initialized");
+                       throw_exce(EX_UNINITIALIZED TSRMLS_CC, "pq\\Connectio not initialized");
                } else {
                        PGresult *res = PQgetResult(obj->intern->conn);
 
                        if (!res) {
                                RETVAL_NULL();
                        } else {
-                               php_pqres_t *r = ecalloc(1, sizeof(*r));
-
-                               r->res = res;
-                               ZEND_INIT_SYMTABLE(&r->bound);
-                               return_value->type = IS_OBJECT;
-                               return_value->value.obj = php_pqres_create_object_ex(php_pqres_class_entry, r, NULL TSRMLS_CC);
+                               php_pq_object_to_zval_no_addref(PQresultInstanceData(res, php_pqconn_event), &return_value TSRMLS_CC);
                        }
 
                        php_pqconn_notify_listeners(obj TSRMLS_CC);
@@ -2288,11 +2444,11 @@ static PHP_METHOD(pqconn, execAsync) {
                php_pqconn_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
 
                if (!obj->intern) {
-                       zend_throw_exception_ex(exce(EX_RUNTIME), EX_RUNTIME TSRMLS_CC, "pq\\Connection not initialized");
+                       throw_exce(EX_UNINITIALIZED TSRMLS_CC, "pq\\Connection not initialized");
                } else if (!PQsendQuery(obj->intern->conn, query_str)) {
-                       zend_throw_exception_ex(exce(EX_RUNTIME), EX_RUNTIME TSRMLS_CC, "Failed to enable unbuffered mode (%s)", PHP_PQerrorMessage(obj->intern->conn));
+                       throw_exce(EX_IO TSRMLS_CC, "Failed to execute query (%s)", PHP_PQerrorMessage(obj->intern->conn));
                } else if (obj->intern->unbuffered && !PQsetSingleRowMode(obj->intern->conn)) {
-                       zend_throw_exception_ex(exce(EX_RUNTIME), EX_RUNTIME TSRMLS_CC, "Failed to request unbuffered result handling (%s)", PHP_PQerrorMessage(obj->intern->conn));
+                       throw_exce(EX_RUNTIME TSRMLS_CC, "Failed to enable unbuffered mode (%s)", PHP_PQerrorMessage(obj->intern->conn));
                } else {
                        obj->intern->poller = PQconsumeInput;
                        php_pq_callback_dtor(&obj->intern->onevent);
@@ -2423,7 +2579,7 @@ static PHP_METHOD(pqconn, execParams) {
                php_pqconn_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
 
                if (!obj->intern) {
-                       zend_throw_exception_ex(exce(EX_RUNTIME), EX_RUNTIME TSRMLS_CC, "pq\\Connection not initialized");
+                       throw_exce(EX_UNINITIALIZED TSRMLS_CC, "pq\\Connection not initialized");
                } else {
                        PGresult *res;
                        int count;
@@ -2449,15 +2605,12 @@ static PHP_METHOD(pqconn, execParams) {
                        }
 
                        if (!res) {
-                               zend_throw_exception_ex(exce(EX_RUNTIME), EX_RUNTIME TSRMLS_CC, "Failed to execute query (%s)", PHP_PQerrorMessage(obj->intern->conn));
+                               throw_exce(EX_RUNTIME TSRMLS_CC, "Failed to execute query (%s)", PHP_PQerrorMessage(obj->intern->conn));
                        } else {
                                if (SUCCESS == php_pqres_success(res TSRMLS_CC)) {
-                                       php_pqres_t *r = ecalloc(1, sizeof(*r));
-
-                                       r->res = res;
-                                       ZEND_INIT_SYMTABLE(&r->bound);
-                                       return_value->type = IS_OBJECT;
-                                       return_value->value.obj = php_pqres_create_object_ex(php_pqres_class_entry, r, NULL TSRMLS_CC);
+                                       php_pq_object_to_zval_no_addref(PQresultInstanceData(res, php_pqconn_event), &return_value TSRMLS_CC);
+                               } else {
+                                       PHP_PQclear(res);
                                }
 
                                php_pqconn_notify_listeners(obj TSRMLS_CC);
@@ -2489,7 +2642,7 @@ static PHP_METHOD(pqconn, execParamsAsync) {
                php_pqconn_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
 
                if (!obj->intern) {
-                       zend_throw_exception_ex(exce(EX_RUNTIME), EX_RUNTIME TSRMLS_CC, "pq\\Connection not initialized");
+                       throw_exce(EX_UNINITIALIZED TSRMLS_CC, "pq\\Connection not initialized");
                } else {
                        int count;
                        Oid *types = NULL;
@@ -2504,9 +2657,9 @@ static PHP_METHOD(pqconn, execParamsAsync) {
                        }
 
                        if (!PQsendQueryParams(obj->intern->conn, query_str, count, types, (const char *const*) params, NULL, NULL, 0)) {
-                               zend_throw_exception_ex(exce(EX_RUNTIME), EX_RUNTIME TSRMLS_CC, "Failed to execute query (%s)", PHP_PQerrorMessage(obj->intern->conn));
+                               throw_exce(EX_IO TSRMLS_CC, "Failed to execute query (%s)", PHP_PQerrorMessage(obj->intern->conn));
                        } else if (obj->intern->unbuffered && !PQsetSingleRowMode(obj->intern->conn)) {
-                               zend_throw_exception_ex(exce(EX_RUNTIME), EX_RUNTIME TSRMLS_CC, "Failed to enable unbuffered mode (%s)", PHP_PQerrorMessage(obj->intern->conn));
+                               throw_exce(EX_RUNTIME TSRMLS_CC, "Failed to enable unbuffered mode (%s)", PHP_PQerrorMessage(obj->intern->conn));
                        } else {
                                obj->intern->poller = PQconsumeInput;
                                php_pq_callback_dtor(&obj->intern->onevent);
@@ -2553,7 +2706,7 @@ static STATUS php_pqconn_prepare(zval *object, php_pqconn_object_t *obj, const c
 
        if (!res) {
                rv = FAILURE;
-               zend_throw_exception_ex(exce(EX_RUNTIME), EX_RUNTIME TSRMLS_CC, "Failed to prepare statement (%s)", PHP_PQerrorMessage(obj->intern->conn));
+               throw_exce(EX_RUNTIME TSRMLS_CC, "Failed to prepare statement (%s)", PHP_PQerrorMessage(obj->intern->conn));
        } else {
                rv = php_pqres_success(res TSRMLS_CC);
                PHP_PQclear(res);
@@ -2583,7 +2736,7 @@ static PHP_METHOD(pqconn, prepare) {
                php_pqconn_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
 
                if (!obj->intern) {
-                       zend_throw_exception_ex(exce(EX_RUNTIME), EX_RUNTIME TSRMLS_CC, "pq\\Connection not initialized");
+                       throw_exce(EX_UNINITIALIZED TSRMLS_CC, "pq\\Connection not initialized");
                } else if (SUCCESS == php_pqconn_prepare(getThis(), obj, name_str, query_str, ztypes ? Z_ARRVAL_P(ztypes) : NULL TSRMLS_CC)) {
                        php_pqstm_t *stm = ecalloc(1, sizeof(*stm));
 
@@ -2614,10 +2767,10 @@ static STATUS php_pqconn_prepare_async(zval *object, php_pqconn_object_t *obj, c
        
        if (!PQsendPrepare(obj->intern->conn, name, query, count, types)) {
                rv = FAILURE;
-               zend_throw_exception_ex(exce(EX_RUNTIME), EX_RUNTIME TSRMLS_CC, "Failed to prepare statement (%s)", PHP_PQerrorMessage(obj->intern->conn));
+               throw_exce(EX_IO TSRMLS_CC, "Failed to prepare statement (%s)", PHP_PQerrorMessage(obj->intern->conn));
        } else if (obj->intern->unbuffered && !PQsetSingleRowMode(obj->intern->conn)) {
                rv = FAILURE;
-               zend_throw_exception_ex(exce(EX_RUNTIME), EX_RUNTIME TSRMLS_CC, "Failed to enable unbuffered mode (%s)", PHP_PQerrorMessage(obj->intern->conn));
+               throw_exce(EX_RUNTIME TSRMLS_CC, "Failed to enable unbuffered mode (%s)", PHP_PQerrorMessage(obj->intern->conn));
        } else {
                rv = SUCCESS;
                obj->intern->poller = PQconsumeInput;
@@ -2651,7 +2804,7 @@ static PHP_METHOD(pqconn, prepareAsync) {
                php_pqconn_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
 
                if (!obj->intern) {
-                       zend_throw_exception_ex(exce(EX_RUNTIME), EX_RUNTIME TSRMLS_CC, "pq\\Connection not initialized");
+                       throw_exce(EX_UNINITIALIZED TSRMLS_CC, "pq\\Connection not initialized");
                } else if (SUCCESS == php_pqconn_prepare_async(getThis(), obj, name_str, query_str, ztypes ? Z_ARRVAL_P(ztypes) : NULL TSRMLS_CC)) {
                        php_pqstm_t *stm = ecalloc(1, sizeof(*stm));
 
@@ -2677,7 +2830,7 @@ static PHP_METHOD(pqconn, quote) {
                php_pqconn_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
 
                if (!obj->intern) {
-                       zend_throw_exception_ex(exce(EX_RUNTIME), EX_RUNTIME TSRMLS_CC, "pq\\Connection not initialized");
+                       throw_exce(EX_UNINITIALIZED TSRMLS_CC, "pq\\Connection not initialized");
                } else {
                        char *quoted = PQescapeLiteral(obj->intern->conn, str, len);
 
@@ -2703,7 +2856,7 @@ static PHP_METHOD(pqconn, quoteName) {
                php_pqconn_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
 
                if (!obj->intern) {
-                       zend_throw_exception_ex(exce(EX_RUNTIME), EX_RUNTIME TSRMLS_CC, "pq\\Connection not initialized");
+                       throw_exce(EX_UNINITIALIZED TSRMLS_CC, "pq\\Connection not initialized");
                } else {
                        char *quoted = PQescapeIdentifier(obj->intern->conn, str, len);
 
@@ -2729,7 +2882,7 @@ static PHP_METHOD(pqconn, escapeBytea) {
                php_pqconn_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
 
                if (!obj->intern) {
-                       zend_throw_exception_ex(exce(EX_RUNTIME), EX_RUNTIME TSRMLS_CC, "pq\\Connection not initialized");
+                       throw_exce(EX_UNINITIALIZED TSRMLS_CC, "pq\\Connection not initialized");
                } else {
                        size_t escaped_len;
                        char *escaped_str = (char *) PQescapeByteaConn(obj->intern->conn, (unsigned char *) str, len, &escaped_len);
@@ -2756,7 +2909,7 @@ static PHP_METHOD(pqconn, unescapeBytea) {
                php_pqconn_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
 
                if (!obj->intern) {
-                       zend_throw_exception_ex(exce(EX_RUNTIME), EX_RUNTIME TSRMLS_CC, "pq\\Connection not initialized");
+                       throw_exce(EX_UNINITIALIZED TSRMLS_CC, "pq\\Connection not initialized");
                } else {
                        size_t unescaped_len;
                        char *unescaped_str = (char *) PQunescapeBytea((unsigned char *)str, &unescaped_len);
@@ -2795,7 +2948,7 @@ static STATUS php_pqconn_start_transaction(zval *zconn, php_pqconn_object_t *con
        }
 
        if (!conn_obj->intern) {
-               zend_throw_exception_ex(exce(EX_RUNTIME), EX_RUNTIME TSRMLS_CC, "pq\\Connection not initialized");
+               throw_exce(EX_UNINITIALIZED TSRMLS_CC, "pq\\Connection not initialized");
        } else {
                PGresult *res;
                smart_str cmd = {0};
@@ -2813,7 +2966,7 @@ static STATUS php_pqconn_start_transaction(zval *zconn, php_pqconn_object_t *con
                res = PQexec(conn_obj->intern->conn, cmd.c);
 
                if (!res) {
-                       zend_throw_exception_ex(exce(EX_RUNTIME), EX_RUNTIME TSRMLS_CC, "Failed to start transaction (%s)", PHP_PQerrorMessage(conn_obj->intern->conn));
+                       throw_exce(EX_RUNTIME TSRMLS_CC, "Failed to start transaction (%s)", PHP_PQerrorMessage(conn_obj->intern->conn));
                } else {
                        rv = php_pqres_success(res TSRMLS_CC);
                        PHP_PQclear(res);
@@ -2835,7 +2988,7 @@ static STATUS php_pqconn_start_transaction_async(zval *zconn, php_pqconn_object_
        }
 
        if (!conn_obj->intern) {
-               zend_throw_exception_ex(exce(EX_RUNTIME), EX_RUNTIME TSRMLS_CC, "pq\\Connection not initialized");
+               throw_exce(EX_UNINITIALIZED TSRMLS_CC, "pq\\Connection not initialized");
        } else {
                smart_str cmd = {0};
                const char *il = isolation_level(&isolation);
@@ -2850,7 +3003,7 @@ static STATUS php_pqconn_start_transaction_async(zval *zconn, php_pqconn_object_
                smart_str_0(&cmd);
 
                if (!PQsendQuery(conn_obj->intern->conn, cmd.c)) {
-                       zend_throw_exception_ex(exce(EX_RUNTIME), EX_RUNTIME TSRMLS_CC, "Failed to start transaction (%s)", PHP_PQerrorMessage(conn_obj->intern->conn));
+                       throw_exce(EX_IO TSRMLS_CC, "Failed to start transaction (%s)", PHP_PQerrorMessage(conn_obj->intern->conn));
                } else {
                        rv = SUCCESS;
                        conn_obj->intern->poller = PQconsumeInput;
@@ -2899,7 +3052,6 @@ static PHP_METHOD(pqconn, startTransaction) {
        }
 }
 
-
 ZEND_BEGIN_ARG_INFO_EX(ai_pqconn_start_transaction_async, 0, 0, 0)
        ZEND_ARG_INFO(0, isolation)
        ZEND_ARG_INFO(0, readonly)
@@ -2944,7 +3096,7 @@ static PHP_METHOD(pqconn, trace) {
                php_pqconn_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
 
                if (!obj->intern) {
-                       zend_throw_exception_ex(exce(EX_RUNTIME), EX_RUNTIME TSRMLS_CC, "pq\\Connection not initialized");
+                       throw_exce(EX_UNINITIALIZED TSRMLS_CC, "pq\\Connection not initialized");
                } else {
                        if (!zstream) {
                                PQuntrace(obj->intern->conn);
@@ -3010,7 +3162,7 @@ static PHP_METHOD(pqtypes, __construct) {
                php_pqconn_object_t *conn_obj = zend_object_store_get_object(zconn TSRMLS_CC);
 
                if (!conn_obj->intern) {
-                       zend_throw_exception_ex(exce(EX_RUNTIME), EX_RUNTIME TSRMLS_CC, "pq\\Connection not initialized");
+                       throw_exce(EX_UNINITIALIZED TSRMLS_CC, "pq\\Connection not initialized");
                } else {
                        php_pqtypes_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
                        zval *retval = NULL;
@@ -3020,13 +3172,11 @@ static PHP_METHOD(pqtypes, __construct) {
                        php_pq_object_addref(conn_obj TSRMLS_CC);
                        zend_hash_init(&obj->intern->types, 300, NULL, ZVAL_PTR_DTOR, 0);
 
-                       zend_replace_error_handling(EH_THROW, exce(EX_RUNTIME), &zeh TSRMLS_CC);
                        if (znsp) {
                                zend_call_method_with_1_params(&getThis(), Z_OBJCE_P(getThis()), NULL, "refresh", &retval, znsp);
                        } else {
                                zend_call_method_with_0_params(&getThis(), Z_OBJCE_P(getThis()), NULL, "refresh", &retval);
                        }
-                       zend_restore_error_handling(&zeh TSRMLS_CC);
 
                        if (retval) {
                                zval_ptr_dtor(&retval);
@@ -3058,7 +3208,7 @@ static PHP_METHOD(pqtypes, refresh) {
                php_pqtypes_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
 
                if (!obj->intern) {
-                       zend_throw_exception_ex(exce(EX_RUNTIME), EX_RUNTIME TSRMLS_CC, "pq\\Types not initialized");
+                       throw_exce(EX_UNINITIALIZED TSRMLS_CC, "pq\\Types not initialized");
                } else {
                        PGresult *res;
 
@@ -3095,7 +3245,7 @@ static PHP_METHOD(pqtypes, refresh) {
                        }
 
                        if (!res) {
-                               zend_throw_exception_ex(exce(EX_RUNTIME), EX_RUNTIME TSRMLS_CC, "Failed to fetch types (%s)", PHP_PQerrorMessage(obj->intern->conn->intern->conn));
+                               throw_exce(EX_RUNTIME TSRMLS_CC, "Failed to fetch types (%s)", PHP_PQerrorMessage(obj->intern->conn->intern->conn));
                        } else {
                                if (SUCCESS == php_pqres_success(res TSRMLS_CC)) {
                                        int r, rows;
@@ -3219,7 +3369,7 @@ static PHP_METHOD(pqres, bind) {
                php_pqres_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
 
                if (!obj->intern) {
-                       zend_throw_exception_ex(exce(EX_RUNTIME), EX_RUNTIME TSRMLS_CC, "pq\\Result not initialized");
+                       throw_exce(EX_UNINITIALIZED TSRMLS_CC, "pq\\Result not initialized");
                } else {
                        php_pqres_col_t col;
 
@@ -3276,7 +3426,7 @@ static PHP_METHOD(pqres, fetchBound) {
                php_pqres_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
 
                if (!obj->intern) {
-                       zend_throw_exception_ex(exce(EX_RUNTIME), EX_RUNTIME TSRMLS_CC, "pq\\Result not initialized");
+                       throw_exce(EX_UNINITIALIZED TSRMLS_CC, "pq\\Result not initialized");
                } else {
                        zval **row = NULL;
 
@@ -3310,7 +3460,7 @@ static PHP_METHOD(pqres, fetchRow) {
 
        if (SUCCESS == rv) {
                if (!obj->intern) {
-                       zend_throw_exception_ex(exce(EX_RUNTIME), EX_RUNTIME TSRMLS_CC, "pq\\Result not initialized");
+                       throw_exce(EX_UNINITIALIZED TSRMLS_CC, "pq\\Result not initialized");
                } else {
                        zval **row = NULL;
 
@@ -3363,7 +3513,7 @@ static PHP_METHOD(pqres, fetchCol) {
                php_pqres_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
 
                if (!obj->intern) {
-                       zend_throw_exception_ex(exce(EX_RUNTIME), EX_RUNTIME TSRMLS_CC, "pq\\Result not initialized");
+                       throw_exce(EX_UNINITIALIZED TSRMLS_CC, "pq\\Result not initialized");
                } else {
                        zval **row = NULL;
 
@@ -3427,7 +3577,7 @@ static PHP_METHOD(pqres, map) {
        long fetch_type = -1;
        STATUS rv;
 
-       zend_replace_error_handling(EH_THROW, NULL, &zeh TSRMLS_CC);
+       zend_replace_error_handling(EH_THROW, exce(EX_INVALID_ARGUMENT), &zeh TSRMLS_CC);
        rv = zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|z/!z/!l", &zkeys, &zvals, &fetch_type);
        zend_restore_error_handling(&zeh TSRMLS_CC);
 
@@ -3435,7 +3585,7 @@ static PHP_METHOD(pqres, map) {
                php_pqres_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
 
                if (!obj->intern) {
-                       zend_throw_exception_ex(exce(EX_RUNTIME), EX_RUNTIME TSRMLS_CC, "pq\\Result not initialized");
+                       throw_exce(EX_UNINITIALIZED TSRMLS_CC, "pq\\Result not initialized");
                } else {
                        int ks = 0, vs = 0;
                        php_pqres_col_t def = {PQfname(obj->intern->res, 0), 0}, *keys = NULL, *vals = NULL;
@@ -3500,7 +3650,7 @@ static PHP_METHOD(pqres, map) {
                                                                break;
                                                        }
                                                        if (SUCCESS != zend_symtable_update(HASH_OF(*cur), key, len + 1, (void *) &tmp, sizeof(zval *), (void *) &cur)) {
-                                                               zend_throw_exception_ex(exce(EX_RUNTIME), EX_RUNTIME TSRMLS_CC, "Failed to create map");
+                                                               throw_exce(EX_RUNTIME TSRMLS_CC, "Failed to create map");
                                                                goto err;
                                                        }
                                                }
@@ -3546,7 +3696,7 @@ static PHP_METHOD(pqres, count) {
                long count;
 
                if (SUCCESS != php_pqres_count_elements(getThis(), &count TSRMLS_CC)) {
-                       zend_throw_exception_ex(exce(EX_RUNTIME), EX_RUNTIME TSRMLS_CC, "pq\\Result not initialized");
+                       throw_exce(EX_UNINITIALIZED TSRMLS_CC, "pq\\Result not initialized");
                } else {
                        RETVAL_LONG(count);
                }
@@ -3578,7 +3728,7 @@ static PHP_METHOD(pqstm, __construct) {
        zend_bool async = 0;
        STATUS rv;
 
-       zend_replace_error_handling(EH_THROW, NULL, &zeh TSRMLS_CC);
+       zend_replace_error_handling(EH_THROW, exce(EX_INVALID_ARGUMENT), &zeh TSRMLS_CC);
        rv = zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "Oss|a/!b", &zconn, php_pqconn_class_entry, &name_str, &name_len, &query_str, &query_len, &ztypes, &async);
        zend_restore_error_handling(&zeh TSRMLS_CC);
 
@@ -3587,7 +3737,7 @@ static PHP_METHOD(pqstm, __construct) {
                php_pqconn_object_t *conn_obj = zend_object_store_get_object(zconn TSRMLS_CC);
 
                if (!conn_obj->intern) {
-                       zend_throw_exception_ex(exce(EX_RUNTIME), EX_RUNTIME TSRMLS_CC, "pq\\Connection not initialized");
+                       throw_exce(EX_UNINITIALIZED TSRMLS_CC, "pq\\Connection not initialized");
                } else {
                        if (async) {
                                rv = php_pqconn_prepare_async(zconn, conn_obj, name_str, query_str, ztypes ? Z_ARRVAL_P(ztypes) : NULL TSRMLS_CC);
@@ -3619,7 +3769,7 @@ static PHP_METHOD(pqstm, bind) {
                php_pqstm_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
 
                if (!obj->intern) {
-                       zend_throw_exception_ex(exce(EX_RUNTIME), EX_RUNTIME TSRMLS_CC, "pq\\Statement not initialized");
+                       throw_exce(EX_UNINITIALIZED TSRMLS_CC, "pq\\Statement not initialized");
                } else {
                        Z_ADDREF_P(param_ref);
                        zend_hash_index_update(&obj->intern->bound, param_no, (void *) &param_ref, sizeof(zval *), NULL);
@@ -3636,7 +3786,7 @@ static PHP_METHOD(pqstm, exec) {
        zval *zparams = NULL;
        STATUS rv;
 
-       zend_replace_error_handling(EH_THROW, NULL, &zeh TSRMLS_CC);
+       zend_replace_error_handling(EH_THROW, exce(EX_INVALID_ARGUMENT), &zeh TSRMLS_CC);
        rv = zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|a/!", &zparams);
        zend_restore_error_handling(&zeh TSRMLS_CC);
 
@@ -3644,7 +3794,7 @@ static PHP_METHOD(pqstm, exec) {
                php_pqstm_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
 
                if (!obj->intern) {
-                       zend_throw_exception_ex(exce(EX_RUNTIME), EX_RUNTIME TSRMLS_CC, "pq\\Statement not initialized");
+                       throw_exce(EX_UNINITIALIZED TSRMLS_CC, "pq\\Statement not initialized");
                } else {
                        int count = 0;
                        char **params = NULL;
@@ -3667,15 +3817,9 @@ static PHP_METHOD(pqstm, exec) {
                        zend_hash_destroy(&zdtor);
 
                        if (!res) {
-                               zend_throw_exception_ex(exce(EX_RUNTIME), EX_RUNTIME TSRMLS_CC, "Failed to execute statement (%s)", PHP_PQerrorMessage(obj->intern->conn->intern->conn));
+                               throw_exce(EX_RUNTIME TSRMLS_CC, "Failed to execute statement (%s)", PHP_PQerrorMessage(obj->intern->conn->intern->conn));
                        } else if (SUCCESS == php_pqres_success(res TSRMLS_CC)) {
-                               php_pqres_t *r = ecalloc(1, sizeof(*r));
-
-                               r->res = res;
-                               ZEND_INIT_SYMTABLE(&r->bound);
-                               return_value->type = IS_OBJECT;
-                               return_value->value.obj = php_pqres_create_object_ex(php_pqres_class_entry, r, NULL TSRMLS_CC);
-
+                               php_pq_object_to_zval_no_addref(PQresultInstanceData(res, php_pqconn_event), &return_value TSRMLS_CC);
                                php_pqconn_notify_listeners(obj->intern->conn TSRMLS_CC);
                        }
                }
@@ -3692,7 +3836,7 @@ static PHP_METHOD(pqstm, execAsync) {
        php_pq_callback_t resolver = {{0}};
        STATUS rv;
 
-       zend_replace_error_handling(EH_THROW, NULL, &zeh TSRMLS_CC);
+       zend_replace_error_handling(EH_THROW, exce(EX_INVALID_ARGUMENT), &zeh TSRMLS_CC);
        rv = zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|a/!f", &zparams, &resolver.fci, &resolver.fcc);
        zend_restore_error_handling(&zeh TSRMLS_CC);
 
@@ -3700,7 +3844,7 @@ static PHP_METHOD(pqstm, execAsync) {
                php_pqstm_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
 
                if (!obj->intern) {
-                       zend_throw_exception_ex(exce(EX_RUNTIME), EX_RUNTIME TSRMLS_CC, "pq\\Statement not initialized");
+                       throw_exce(EX_UNINITIALIZED TSRMLS_CC, "pq\\Statement not initialized");
                } else {
                        int count;
                        char **params = NULL;
@@ -3712,9 +3856,9 @@ static PHP_METHOD(pqstm, execAsync) {
                        }
 
                        if (!PQsendQueryPrepared(obj->intern->conn->intern->conn, obj->intern->name, count, (const char *const*) params, NULL, NULL, 0)) {
-                               zend_throw_exception_ex(exce(EX_RUNTIME), EX_RUNTIME TSRMLS_CC, PHP_PQerrorMessage(obj->intern->conn->intern->conn));
+                               throw_exce(EX_IO TSRMLS_CC, "Failed to execute statement (%s)", PHP_PQerrorMessage(obj->intern->conn->intern->conn));
                        } else if (obj->intern->conn->intern->unbuffered && !PQsetSingleRowMode(obj->intern->conn->intern->conn)) {
-                               zend_throw_exception_ex(exce(EX_RUNTIME), EX_RUNTIME TSRMLS_CC, "Failed to enable unbuffered mode (%s)", PHP_PQerrorMessage(obj->intern->conn->intern->conn));
+                               throw_exce(EX_RUNTIME TSRMLS_CC, "Failed to enable unbuffered mode (%s)", PHP_PQerrorMessage(obj->intern->conn->intern->conn));
                        } else {
                                php_pq_callback_dtor(&obj->intern->conn->intern->onevent);
                                if (resolver.fci.size > 0) {
@@ -3742,7 +3886,7 @@ static PHP_METHOD(pqstm, desc) {
        zend_error_handling zeh;
        STATUS rv;
 
-       zend_replace_error_handling(EH_THROW, NULL, &zeh TSRMLS_CC);
+       zend_replace_error_handling(EH_THROW, exce(EX_INVALID_ARGUMENT), &zeh TSRMLS_CC);
        rv = zend_parse_parameters_none();
        zend_restore_error_handling(&zeh TSRMLS_CC);
 
@@ -3750,12 +3894,12 @@ static PHP_METHOD(pqstm, desc) {
                php_pqstm_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
 
                if (!obj->intern) {
-                       zend_throw_exception_ex(exce(EX_RUNTIME), EX_RUNTIME TSRMLS_CC, "pq\\Statement not initialized");
+                       throw_exce(EX_UNINITIALIZED TSRMLS_CC, "pq\\Statement not initialized");
                } else {
                        PGresult *res = PQdescribePrepared(obj->intern->conn->intern->conn, obj->intern->name);
 
                        if (!res) {
-                               zend_throw_exception_ex(exce(EX_RUNTIME), EX_RUNTIME TSRMLS_CC, "Failed to describe statement (%s)", PHP_PQerrorMessage(obj->intern->conn->intern->conn));
+                               throw_exce(EX_RUNTIME TSRMLS_CC, "Failed to describe statement (%s)", PHP_PQerrorMessage(obj->intern->conn->intern->conn));
                        } else {
                                if (SUCCESS == php_pqres_success(res TSRMLS_CC)) {
                                        int p, params;
@@ -3778,7 +3922,7 @@ static PHP_METHOD(pqstm, descAsync) {
        zend_error_handling zeh;
        STATUS rv;
 
-       zend_replace_error_handling(EH_THROW, NULL, &zeh TSRMLS_CC);
+       zend_replace_error_handling(EH_THROW, exce(EX_INVALID_ARGUMENT), &zeh TSRMLS_CC);
        rv = zend_parse_parameters_none();
        zend_restore_error_handling(&zeh TSRMLS_CC);
 
@@ -3786,9 +3930,9 @@ static PHP_METHOD(pqstm, descAsync) {
                php_pqstm_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
 
                if (!obj->intern) {
-                       zend_throw_exception_ex(exce(EX_RUNTIME), EX_RUNTIME TSRMLS_CC, "pq\\Statement not initialized");
+                       throw_exce(EX_UNINITIALIZED TSRMLS_CC, "pq\\Statement not initialized");
                } else if (!PQsendDescribePrepared(obj->intern->conn->intern->conn, obj->intern->name)) {
-                       zend_throw_exception_ex(exce(EX_RUNTIME), EX_RUNTIME TSRMLS_CC, "Failed to describe statement: %s", PHP_PQerrorMessage(obj->intern->conn->intern->conn));
+                       throw_exce(EX_IO TSRMLS_CC, "Failed to describe statement: %s", PHP_PQerrorMessage(obj->intern->conn->intern->conn));
                } else {
                        obj->intern->conn->intern->poller = PQconsumeInput;
                        php_pqconn_notify_listeners(obj->intern->conn TSRMLS_CC);
@@ -3820,7 +3964,7 @@ static PHP_METHOD(pqtxn, __construct) {
        zend_bool async = 0, readonly = 0, deferrable = 0;
        STATUS rv;
 
-       zend_replace_error_handling(EH_THROW, NULL, &zeh TSRMLS_CC);
+       zend_replace_error_handling(EH_THROW, exce(EX_INVALID_ARGUMENT), &zeh TSRMLS_CC);
        rv = zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O|blbb", &zconn, php_pqconn_class_entry, &async, &isolation, &readonly, &deferrable);
        zend_restore_error_handling(&zeh TSRMLS_CC);
 
@@ -3828,7 +3972,7 @@ static PHP_METHOD(pqtxn, __construct) {
                php_pqconn_object_t *conn_obj = zend_object_store_get_object(zconn TSRMLS_CC);
 
                if (!conn_obj->intern) {
-                       zend_throw_exception_ex(exce(EX_RUNTIME), EX_RUNTIME TSRMLS_CC, "pq\\Connection not initialized");
+                       throw_exce(EX_UNINITIALIZED TSRMLS_CC, "pq\\Connection not initialized");
                } else {
                        if (async) {
                                rv = php_pqconn_start_transaction_async(zconn, conn_obj, isolation, readonly, deferrable TSRMLS_CC);
@@ -3858,7 +4002,7 @@ static PHP_METHOD(pqtxn, savepoint) {
        zend_error_handling zeh;
        STATUS rv;
 
-       zend_replace_error_handling(EH_THROW, NULL, &zeh TSRMLS_CC);
+       zend_replace_error_handling(EH_THROW, exce(EX_INVALID_ARGUMENT), &zeh TSRMLS_CC);
        rv = zend_parse_parameters_none();
        zend_restore_error_handling(&zeh TSRMLS_CC);
 
@@ -3866,9 +4010,9 @@ static PHP_METHOD(pqtxn, savepoint) {
                php_pqtxn_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
 
                if (!obj->intern) {
-                       zend_throw_exception_ex(exce(EX_RUNTIME), EX_RUNTIME TSRMLS_CC, "pq\\Transaction not initialized");
+                       throw_exce(EX_UNINITIALIZED TSRMLS_CC, "pq\\Transaction not initialized");
                } else if (!obj->intern->open) {
-                       zend_throw_exception_ex(exce(EX_RUNTIME), EX_RUNTIME TSRMLS_CC, "pq\\Transaction already closed");
+                       throw_exce(EX_RUNTIME TSRMLS_CC, "pq\\Transaction already closed");
                } else {
                        PGresult *res;
                        smart_str cmd = {0};
@@ -3881,7 +4025,7 @@ static PHP_METHOD(pqtxn, savepoint) {
                        res = PQexec(obj->intern->conn->intern->conn, cmd.c);
 
                        if (!res) {
-                               zend_throw_exception_ex(exce(EX_RUNTIME), EX_RUNTIME TSRMLS_CC, "Failed to create %s (%s)", cmd.c, PHP_PQerrorMessage(obj->intern->conn->intern->conn));
+                               throw_exce(EX_RUNTIME TSRMLS_CC, "Failed to create %s (%s)", cmd.c, PHP_PQerrorMessage(obj->intern->conn->intern->conn));
                        } else {
                                php_pqres_success(res TSRMLS_CC);
                                PHP_PQclear(res);
@@ -3898,7 +4042,7 @@ static PHP_METHOD(pqtxn, savepointAsync) {
        zend_error_handling zeh;
        STATUS rv;
 
-       zend_replace_error_handling(EH_THROW, NULL, &zeh TSRMLS_CC);
+       zend_replace_error_handling(EH_THROW, exce(EX_INVALID_ARGUMENT), &zeh TSRMLS_CC);
        rv = zend_parse_parameters_none();
        zend_restore_error_handling(&zeh TSRMLS_CC);
 
@@ -3906,9 +4050,9 @@ static PHP_METHOD(pqtxn, savepointAsync) {
                php_pqtxn_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
 
                if (!obj->intern) {
-                       zend_throw_exception_ex(exce(EX_RUNTIME), EX_RUNTIME TSRMLS_CC, "pq\\Transaction not initialized");
+                       throw_exce(EX_UNINITIALIZED TSRMLS_CC, "pq\\Transaction not initialized");
                } else if (!obj->intern->open) {
-                       zend_throw_exception_ex(exce(EX_RUNTIME), EX_RUNTIME TSRMLS_CC, "pq\\Transaction already closed");
+                       throw_exce(EX_RUNTIME TSRMLS_CC, "pq\\Transaction already closed");
                } else {
                        smart_str cmd = {0};
 
@@ -3918,7 +4062,7 @@ static PHP_METHOD(pqtxn, savepointAsync) {
                        smart_str_0(&cmd);
 
                        if (!PQsendQuery(obj->intern->conn->intern->conn, cmd.c)) {
-                               zend_throw_exception_ex(exce(EX_RUNTIME), EX_RUNTIME TSRMLS_CC, "Failed to create %s (%s)", cmd.c, PHP_PQerrorMessage(obj->intern->conn->intern->conn));
+                               throw_exce(EX_IO TSRMLS_CC, "Failed to create %s (%s)", cmd.c, PHP_PQerrorMessage(obj->intern->conn->intern->conn));
                        }
 
                        smart_str_free(&cmd);
@@ -3932,7 +4076,7 @@ static PHP_METHOD(pqtxn, commit) {
        zend_error_handling zeh;
        STATUS rv;
 
-       zend_replace_error_handling(EH_THROW, NULL, &zeh TSRMLS_CC);
+       zend_replace_error_handling(EH_THROW, exce(EX_INVALID_ARGUMENT), &zeh TSRMLS_CC);
        rv = zend_parse_parameters_none();
        zend_restore_error_handling(&zeh TSRMLS_CC);
 
@@ -3940,9 +4084,9 @@ static PHP_METHOD(pqtxn, commit) {
                php_pqtxn_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
 
                if (!obj->intern) {
-                       zend_throw_exception_ex(exce(EX_RUNTIME), EX_RUNTIME TSRMLS_CC, "pq\\Transacation not initialized");
+                       throw_exce(EX_UNINITIALIZED TSRMLS_CC, "pq\\Transacation not initialized");
                } else if (!obj->intern->open) {
-                       zend_throw_exception_ex(exce(EX_RUNTIME), EX_RUNTIME TSRMLS_CC, "pq\\Transacation already closed");
+                       throw_exce(EX_RUNTIME TSRMLS_CC, "pq\\Transacation already closed");
                } else {
                        PGresult *res;
                        smart_str cmd = {0};
@@ -3959,7 +4103,7 @@ static PHP_METHOD(pqtxn, commit) {
                        }
 
                        if (!res) {
-                               zend_throw_exception_ex(exce(EX_RUNTIME), EX_RUNTIME TSRMLS_CC, "Failed to %s (%s)", cmd.c ? cmd.c : "commit transaction", PHP_PQerrorMessage(obj->intern->conn->intern->conn));
+                               throw_exce(EX_RUNTIME TSRMLS_CC, "Failed to %s (%s)", cmd.c ? cmd.c : "commit transaction", PHP_PQerrorMessage(obj->intern->conn->intern->conn));
                        } else {
                                if (SUCCESS == php_pqres_success(res TSRMLS_CC)) {
                                        if (!cmd.c) {
@@ -3981,7 +4125,7 @@ static PHP_METHOD(pqtxn, commitAsync) {
        zend_error_handling zeh;
        STATUS rv;
 
-       zend_replace_error_handling(EH_THROW, NULL, &zeh TSRMLS_CC);
+       zend_replace_error_handling(EH_THROW, exce(EX_INVALID_ARGUMENT), &zeh TSRMLS_CC);
        rv = zend_parse_parameters_none();
        zend_restore_error_handling(&zeh TSRMLS_CC);
 
@@ -3989,9 +4133,9 @@ static PHP_METHOD(pqtxn, commitAsync) {
                php_pqtxn_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
 
                if (!obj->intern) {
-                       zend_throw_exception_ex(exce(EX_RUNTIME), EX_RUNTIME TSRMLS_CC, "pq\\Transaction not initialized");
+                       throw_exce(EX_UNINITIALIZED TSRMLS_CC, "pq\\Transaction not initialized");
                } else if (!obj->intern->open) {
-                       zend_throw_exception_ex(exce(EX_RUNTIME), EX_RUNTIME TSRMLS_CC, "pq\\Transaction already closed");
+                       throw_exce(EX_RUNTIME TSRMLS_CC, "pq\\Transaction already closed");
                } else {
                        int rc;
                        smart_str cmd = {0};
@@ -4008,7 +4152,7 @@ static PHP_METHOD(pqtxn, commitAsync) {
                        }
 
                        if (!rc) {
-                               zend_throw_exception_ex(exce(EX_RUNTIME), EX_RUNTIME TSRMLS_CC, "Failed to %s (%s)", cmd.c ? cmd.c : "commmit transaction", PHP_PQerrorMessage(obj->intern->conn->intern->conn));
+                               throw_exce(EX_IO TSRMLS_CC, "Failed to %s (%s)", cmd.c ? cmd.c : "commmit transaction", PHP_PQerrorMessage(obj->intern->conn->intern->conn));
                        } else {
                                if (!cmd.c) {
                                        obj->intern->open = 0;
@@ -4028,7 +4172,7 @@ static PHP_METHOD(pqtxn, rollback) {
        zend_error_handling zeh;
        STATUS rv;
 
-       zend_replace_error_handling(EH_THROW, NULL, &zeh TSRMLS_CC);
+       zend_replace_error_handling(EH_THROW, exce(EX_INVALID_ARGUMENT), &zeh TSRMLS_CC);
        rv = zend_parse_parameters_none();
        zend_restore_error_handling(&zeh TSRMLS_CC);
 
@@ -4036,9 +4180,9 @@ static PHP_METHOD(pqtxn, rollback) {
                php_pqtxn_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
 
                if (!obj->intern) {
-                       zend_throw_exception_ex(exce(EX_RUNTIME), EX_RUNTIME TSRMLS_CC, "pq\\Transaction not initialized");
+                       throw_exce(EX_UNINITIALIZED TSRMLS_CC, "pq\\Transaction not initialized");
                } else if (!obj->intern->open) {
-                       zend_throw_exception_ex(exce(EX_RUNTIME), EX_RUNTIME TSRMLS_CC, "pq\\Transaction already closed");
+                       throw_exce(EX_RUNTIME TSRMLS_CC, "pq\\Transaction already closed");
                } else {
                        PGresult *res;
                        smart_str cmd = {0};
@@ -4055,7 +4199,7 @@ static PHP_METHOD(pqtxn, rollback) {
                        }
 
                        if (!res) {
-                               zend_throw_exception_ex(exce(EX_RUNTIME), EX_RUNTIME TSRMLS_CC, "Failed to %s (%s)", cmd.c ? cmd.c : "rollback transaction", PHP_PQerrorMessage(obj->intern->conn->intern->conn));
+                               throw_exce(EX_RUNTIME TSRMLS_CC, "Failed to %s (%s)", cmd.c ? cmd.c : "rollback transaction", PHP_PQerrorMessage(obj->intern->conn->intern->conn));
                        } else {
                                if (SUCCESS == php_pqres_success(res TSRMLS_CC)) {
                                        if (!cmd.c) {
@@ -4077,7 +4221,7 @@ static PHP_METHOD(pqtxn, rollbackAsync) {
        zend_error_handling zeh;
        STATUS rv;
 
-       zend_replace_error_handling(EH_THROW, NULL, &zeh TSRMLS_CC);
+       zend_replace_error_handling(EH_THROW, exce(EX_INVALID_ARGUMENT), &zeh TSRMLS_CC);
        rv = zend_parse_parameters_none();
        zend_restore_error_handling(&zeh TSRMLS_CC);
 
@@ -4085,9 +4229,9 @@ static PHP_METHOD(pqtxn, rollbackAsync) {
                php_pqtxn_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
 
                if (!obj->intern) {
-                       zend_throw_exception_ex(exce(EX_RUNTIME), EX_RUNTIME TSRMLS_CC, "pq\\Transaction not initialized");
+                       throw_exce(EX_UNINITIALIZED TSRMLS_CC, "pq\\Transaction not initialized");
                } else if (!obj->intern->open) {
-                       zend_throw_exception_ex(exce(EX_RUNTIME), EX_RUNTIME TSRMLS_CC, "pq\\Transaction already closed");
+                       throw_exce(EX_RUNTIME TSRMLS_CC, "pq\\Transaction already closed");
                } else {
                        int rc;
                        smart_str cmd = {0};
@@ -4104,7 +4248,7 @@ static PHP_METHOD(pqtxn, rollbackAsync) {
                        }
 
                        if (!rc) {
-                               zend_throw_exception_ex(exce(EX_RUNTIME), EX_RUNTIME TSRMLS_CC, "Failed to %s (%s)", cmd.c ? cmd.c : "rollback transaction", PHP_PQerrorMessage(obj->intern->conn->intern->conn));
+                               throw_exce(EX_IO TSRMLS_CC, "Failed to %s (%s)", cmd.c ? cmd.c : "rollback transaction", PHP_PQerrorMessage(obj->intern->conn->intern->conn));
                        } else {
                                if (!cmd.c) {
                                        obj->intern->open = 0;
@@ -4124,7 +4268,7 @@ static PHP_METHOD(pqtxn, exportSnapshot) {
        zend_error_handling zeh;
        STATUS rv;
 
-       zend_replace_error_handling(EH_THROW, NULL, &zeh TSRMLS_CC);
+       zend_replace_error_handling(EH_THROW, exce(EX_INVALID_ARGUMENT), &zeh TSRMLS_CC);
        rv = zend_parse_parameters_none();
        zend_restore_error_handling(&zeh TSRMLS_CC);
 
@@ -4132,12 +4276,12 @@ static PHP_METHOD(pqtxn, exportSnapshot) {
                php_pqtxn_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
 
                if (!obj->intern) {
-                       zend_throw_exception_ex(exce(EX_RUNTIME), EX_RUNTIME TSRMLS_CC, "pq\\Transaction not initialized");
+                       throw_exce(EX_UNINITIALIZED TSRMLS_CC, "pq\\Transaction not initialized");
                } else {
                        PGresult *res = PQexec(obj->intern->conn->intern->conn, "SELECT pg_export_snapshot()");
 
                        if (!res) {
-                               zend_throw_exception_ex(exce(EX_RUNTIME), EX_RUNTIME TSRMLS_CC, "Failed to export transaction snapshot (%s)", PHP_PQerrorMessage(obj->intern->conn->intern->conn));
+                               throw_exce(EX_RUNTIME TSRMLS_CC, "Failed to export transaction snapshot (%s)", PHP_PQerrorMessage(obj->intern->conn->intern->conn));
                        } else {
                                if (SUCCESS == php_pqres_success(res TSRMLS_CC)) {
                                        RETVAL_STRING(PQgetvalue(res, 0, 0), 1);
@@ -4157,7 +4301,7 @@ static PHP_METHOD(pqtxn, exportSnapshotAsync) {
        zend_error_handling zeh;
        STATUS rv;
 
-       zend_replace_error_handling(EH_THROW, NULL, &zeh TSRMLS_CC);
+       zend_replace_error_handling(EH_THROW, exce(EX_INVALID_ARGUMENT), &zeh TSRMLS_CC);
        rv = zend_parse_parameters_none();
        zend_restore_error_handling(&zeh TSRMLS_CC);
 
@@ -4165,9 +4309,9 @@ static PHP_METHOD(pqtxn, exportSnapshotAsync) {
                php_pqtxn_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
 
                if (!obj->intern) {
-                       zend_throw_exception_ex(exce(EX_RUNTIME), EX_RUNTIME TSRMLS_CC, "pq\\Transaction not initialized");
+                       throw_exce(EX_UNINITIALIZED TSRMLS_CC, "pq\\Transaction not initialized");
                } else if (!PQsendQuery(obj->intern->conn->intern->conn, "SELECT pg_export_snapshot()")) {
-                       zend_throw_exception_ex(exce(EX_RUNTIME), EX_RUNTIME TSRMLS_CC, "Failed to export transaction snapshot (%s)", PHP_PQerrorMessage(obj->intern->conn->intern->conn));
+                       throw_exce(EX_IO TSRMLS_CC, "Failed to export transaction snapshot (%s)", PHP_PQerrorMessage(obj->intern->conn->intern->conn));
                } else {
                        obj->intern->conn->intern->poller = PQconsumeInput;
                        php_pqconn_notify_listeners(obj->intern->conn TSRMLS_CC);
@@ -4184,7 +4328,7 @@ static PHP_METHOD(pqtxn, importSnapshot) {
        int snapshot_len;
        STATUS rv;
 
-       zend_replace_error_handling(EH_THROW, NULL, &zeh TSRMLS_CC);
+       zend_replace_error_handling(EH_THROW, exce(EX_INVALID_ARGUMENT), &zeh TSRMLS_CC);
        rv = zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &snapshot_str, &snapshot_len);
        zend_restore_error_handling(&zeh TSRMLS_CC);
 
@@ -4192,14 +4336,14 @@ static PHP_METHOD(pqtxn, importSnapshot) {
                php_pqtxn_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
 
                if (!obj->intern) {
-                       zend_throw_exception_ex(exce(EX_RUNTIME), EX_RUNTIME TSRMLS_CC, "pq\\Transaction not initialized");
+                       throw_exce(EX_UNINITIALIZED TSRMLS_CC, "pq\\Transaction not initialized");
                } else if (obj->intern->isolation < PHP_PQTXN_REPEATABLE_READ) {
-                       zend_throw_exception_ex(exce(EX_RUNTIME), EX_RUNTIME TSRMLS_CC, "pq\\Transaction must have at least isolation level REPEATABLE READ to be able to import a snapshot");
+                       throw_exce(EX_RUNTIME TSRMLS_CC, "pq\\Transaction must have at least isolation level REPEATABLE READ to be able to import a snapshot");
                } else {
                        char *sid = PQescapeLiteral(obj->intern->conn->intern->conn, snapshot_str, snapshot_len);
 
                        if (!sid) {
-                               zend_throw_exception_ex(exce(EX_RUNTIME), EX_RUNTIME TSRMLS_CC, "Failed to quote snapshot identifier (%s)", PHP_PQerrorMessage(obj->intern->conn->intern->conn));
+                               throw_exce(EX_ESCAPE TSRMLS_CC, "Failed to quote snapshot identifier (%s)", PHP_PQerrorMessage(obj->intern->conn->intern->conn));
                        } else {
                                PGresult *res;
                                smart_str cmd = {0};
@@ -4211,7 +4355,7 @@ static PHP_METHOD(pqtxn, importSnapshot) {
                                res = PQexec(obj->intern->conn->intern->conn, cmd.c);
 
                                if (!res) {
-                                       zend_throw_exception_ex(exce(EX_RUNTIME), EX_RUNTIME TSRMLS_CC, "Failed to import transaction snapshot (%s)", PHP_PQerrorMessage(obj->intern->conn->intern->conn));
+                                       throw_exce(EX_RUNTIME TSRMLS_CC, "Failed to import transaction snapshot (%s)", PHP_PQerrorMessage(obj->intern->conn->intern->conn));
                                } else {
                                        php_pqres_success(res TSRMLS_CC);
                                        PHP_PQclear(res);
@@ -4233,7 +4377,7 @@ static PHP_METHOD(pqtxn, importSnapshotAsync) {
        int snapshot_len;
        STATUS rv;
 
-       zend_replace_error_handling(EH_THROW, NULL, &zeh TSRMLS_CC);
+       zend_replace_error_handling(EH_THROW, exce(EX_INVALID_ARGUMENT), &zeh TSRMLS_CC);
        rv = zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &snapshot_str, &snapshot_len);
        zend_restore_error_handling(&zeh TSRMLS_CC);
 
@@ -4241,14 +4385,14 @@ static PHP_METHOD(pqtxn, importSnapshotAsync) {
                php_pqtxn_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
 
                if (!obj->intern) {
-                       zend_throw_exception_ex(exce(EX_RUNTIME), EX_RUNTIME TSRMLS_CC, "pq\\Transaction not initialized");
+                       throw_exce(EX_UNINITIALIZED TSRMLS_CC, "pq\\Transaction not initialized");
                } else if (obj->intern->isolation < PHP_PQTXN_REPEATABLE_READ) {
-                       zend_throw_exception_ex(exce(EX_RUNTIME), EX_RUNTIME TSRMLS_CC, "pq\\Transaction must have at least isolation level REPEATABLE READ to be able to import a snapshot");
+                       throw_exce(EX_RUNTIME TSRMLS_CC, "pq\\Transaction must have at least isolation level REPEATABLE READ to be able to import a snapshot");
                } else {
                        char *sid = PQescapeLiteral(obj->intern->conn->intern->conn, snapshot_str, snapshot_len);
 
                        if (!sid) {
-                               zend_throw_exception_ex(exce(EX_RUNTIME), EX_RUNTIME TSRMLS_CC, "Failed to quote snapshot identifier (%s)", PHP_PQerrorMessage(obj->intern->conn->intern->conn));
+                               throw_exce(EX_ESCAPE TSRMLS_CC, "Failed to quote snapshot identifier (%s)", PHP_PQerrorMessage(obj->intern->conn->intern->conn));
                        } else {
                                smart_str cmd = {0};
 
@@ -4257,7 +4401,7 @@ static PHP_METHOD(pqtxn, importSnapshotAsync) {
                                smart_str_0(&cmd);
 
                                if (!PQsendQuery(obj->intern->conn->intern->conn, cmd.c)) {
-                                       zend_throw_exception_ex(exce(EX_RUNTIME), EX_RUNTIME TSRMLS_CC, "Failed to %s (%s)", cmd.c, PHP_PQerrorMessage(obj->intern->conn->intern->conn));
+                                       throw_exce(EX_IO TSRMLS_CC, "Failed to %s (%s)", cmd.c, PHP_PQerrorMessage(obj->intern->conn->intern->conn));
                                } else {
                                        obj->intern->conn->intern->poller = PQconsumeInput;
                                }
@@ -4269,22 +4413,44 @@ static PHP_METHOD(pqtxn, importSnapshotAsync) {
        }
 }
 
-ZEND_BEGIN_ARG_INFO_EX(ai_pqtxn_open_lob, 0, 0, 1)
-       ZEND_ARG_INFO(0, oid)
-       ZEND_ARG_INFO(0, mode)
+static const char *strmode(long mode)
+{
+       switch (mode & (INV_READ|INV_WRITE)) {
+       case INV_READ|INV_WRITE:
+               return "rw";
+       case INV_READ:
+               return "r";
+       case INV_WRITE:
+               return "w";
+       default:
+               return "-";
+       }
+}
+
+ZEND_BEGIN_ARG_INFO_EX(ai_pqtxn_open_lob, 0, 0, 1)
+       ZEND_ARG_INFO(0, oid)
+       ZEND_ARG_INFO(0, mode)
 ZEND_END_ARG_INFO();
 static PHP_METHOD(pqtxn, openLOB) {
        zend_error_handling zeh;
        long mode = INV_WRITE|INV_READ, loid;
+       STATUS rv;
+
+       zend_replace_error_handling(EH_THROW, exce(EX_INVALID_ARGUMENT), &zeh TSRMLS_CC);
+       rv = zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l|l", &loid, &mode);
+       zend_restore_error_handling(&zeh TSRMLS_CC);
 
-       zend_replace_error_handling(EH_THROW, NULL, &zeh TSRMLS_CC);
-       if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l|l", &loid, &mode)) {
+       if (SUCCESS == rv) {
                php_pqtxn_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
 
-               if (obj->intern) {
+               if (!obj->intern) {
+                       throw_exce(EX_UNINITIALIZED TSRMLS_CC, "pq\\Transaction not initialized");
+               } else {
                        int lofd = lo_open(obj->intern->conn->intern->conn, loid, mode);
 
-                       if (lofd >= 0) {
+                       if (lofd < 0) {
+                               throw_exce(EX_RUNTIME TSRMLS_CC, "Failed to open large object with oid=%ld with mode '%s' (%s)", loid, strmode(mode), PHP_PQerrorMessage(obj->intern->conn->intern->conn));
+                       } else {
                                php_pqlob_t *lob = ecalloc(1, sizeof(*lob));
 
                                lob->lofd = lofd;
@@ -4294,19 +4460,11 @@ static PHP_METHOD(pqtxn, openLOB) {
 
                                return_value->type = IS_OBJECT;
                                return_value->value.obj = php_pqlob_create_object_ex(php_pqlob_class_entry, lob, NULL TSRMLS_CC);
-                       } else {
-                               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to open large object with mode '%s' (%s)",
-                                               (mode & (INV_READ|INV_WRITE) ? "rw" :
-                                                               (mode & INV_READ ? "r" :
-                                                                               (mode & INV_WRITE ? "w" : "-"))),
-                                               PHP_PQerrorMessage(obj->intern->conn->intern->conn)
-                               );
                        }
-               } else {
-                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "pq\\Transaction not initialized");
+
+                       php_pqconn_notify_listeners(obj->intern->conn TSRMLS_CC);
                }
        }
-       zend_restore_error_handling(&zeh TSRMLS_CC);
 }
 
 ZEND_BEGIN_ARG_INFO_EX(ai_pqtxn_create_lob, 0, 0, 0)
@@ -4315,19 +4473,30 @@ ZEND_END_ARG_INFO();
 static PHP_METHOD(pqtxn, createLOB) {
        zend_error_handling zeh;
        long mode = INV_WRITE|INV_READ;
+       STATUS rv;
+
+       zend_replace_error_handling(EH_THROW, exce(EX_INVALID_ARGUMENT), &zeh TSRMLS_CC);
+       rv = zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|l", &mode);
+       zend_restore_error_handling(&zeh TSRMLS_CC);
 
-       zend_replace_error_handling(EH_THROW, NULL, &zeh TSRMLS_CC);
-       if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|l", &mode)) {
+       if (SUCCESS == rv) {
                php_pqtxn_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
 
-               if (obj->intern) {
+               if (!obj->intern) {
+                       throw_exce(EX_UNINITIALIZED TSRMLS_CC, "pq\\Transaction not initialized");
+               } else {
                        Oid loid = lo_creat(obj->intern->conn->intern->conn, mode);
 
-                       if (loid != InvalidOid) {
+                       if (loid == InvalidOid) {
+                               throw_exce(EX_RUNTIME TSRMLS_CC, "Failed to create large object with mode '%s' (%s)", strmode(mode), PHP_PQerrorMessage(obj->intern->conn->intern->conn));
+                       } else {
                                int lofd = lo_open(obj->intern->conn->intern->conn, loid, mode);
 
-                               if (lofd >= 0) {
+                               if (lofd < 0) {
+                                       throw_exce(EX_RUNTIME TSRMLS_CC, "Failed to open large object with oid=%ld with mode '%s': %s", loid, strmode(mode), PHP_PQerrorMessage(obj->intern->conn->intern->conn));
+                               } else {
                                        php_pqlob_t *lob = ecalloc(1, sizeof(*lob));
+
                                        lob->lofd = lofd;
                                        lob->loid = loid;
                                        php_pq_object_addref(obj TSRMLS_CC);
@@ -4335,48 +4504,39 @@ static PHP_METHOD(pqtxn, createLOB) {
 
                                        return_value->type = IS_OBJECT;
                                        return_value->value.obj = php_pqlob_create_object_ex(php_pqlob_class_entry, lob, NULL TSRMLS_CC);
-                               } else {
-                                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to open large object with mode '%s': %s",
-                                                       (mode & (INV_READ|INV_WRITE) ? "rw" :
-                                                                       (mode & INV_READ ? "r" :
-                                                                                       (mode & INV_WRITE ? "w" : "-"))),
-                                                       PHP_PQerrorMessage(obj->intern->conn->intern->conn)
-                                       );
                                }
-                       } else {
-                               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to create large object with mode '%s': %s",
-                                               (mode & (INV_READ|INV_WRITE) ? "rw" :
-                                                               (mode & INV_READ ? "r" :
-                                                                               (mode & INV_WRITE ? "w" : "-"))),
-                                               PHP_PQerrorMessage(obj->intern->conn->intern->conn)
-                               );
                        }
-               } else {
-                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "pq\\Transaction not initialized");
+
+                       php_pqconn_notify_listeners(obj->intern->conn TSRMLS_CC);
                }
        }
-       zend_restore_error_handling(&zeh TSRMLS_CC);
 }
 
 ZEND_BEGIN_ARG_INFO_EX(ai_pqtxn_unlink_lob, 0, 0, 1)
        ZEND_ARG_INFO(0, oid)
 ZEND_END_ARG_INFO();
 static PHP_METHOD(pqtxn, unlinkLOB) {
+       zend_error_handling zeh;
        long loid;
+       STATUS rv;
+
+       zend_replace_error_handling(EH_THROW, exce(EX_INVALID_ARGUMENT), &zeh TSRMLS_CC);
+       rv = zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &loid);
+       zend_restore_error_handling(&zeh TSRMLS_CC);
 
-       if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &loid)) {
+       if (SUCCESS == rv) {
                php_pqtxn_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
 
-               if (obj->intern) {
-                       if (1 == lo_unlink(obj->intern->conn->intern->conn, loid)) {
-                               RETVAL_TRUE;
-                       } else {
-                               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to unlink LOB (oid=%ld): %s", loid, PHP_PQerrorMessage(obj->intern->conn->intern->conn));
-                               RETVAL_FALSE;
-                       }
+               if (!obj->intern) {
+                       throw_exce(EX_UNINITIALIZED TSRMLS_CC, "pq\\Transaction not initialized");
                } else {
-                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "pq\\Transaction not initialized");
-                       RETVAL_FALSE;
+                       int rc = lo_unlink(obj->intern->conn->intern->conn, loid);
+
+                       if (rc != 1) {
+                               throw_exce(EX_RUNTIME TSRMLS_CC, "Failed to unlink LOB (oid=%ld): %s", loid, PHP_PQerrorMessage(obj->intern->conn->intern->conn));
+                       }
+
+                       php_pqconn_notify_listeners(obj->intern->conn TSRMLS_CC);
                }
        }
 }
@@ -4405,51 +4565,57 @@ ZEND_END_ARG_INFO();
 static PHP_METHOD(pqcancel, __construct) {
        zend_error_handling zeh;
        zval *zconn;
+       STATUS rv;
+
+       zend_replace_error_handling(EH_THROW, exce(EX_INVALID_ARGUMENT), &zeh TSRMLS_CC);
+       rv = zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O", &zconn, php_pqconn_class_entry);
+       zend_restore_error_handling(&zeh TSRMLS_CC);
 
-       zend_replace_error_handling(EH_THROW, NULL, &zeh TSRMLS_CC);
-       if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O", &zconn, php_pqconn_class_entry)) {
+       if (SUCCESS == rv) {
                php_pqconn_object_t *conn_obj = zend_object_store_get_object(zconn TSRMLS_CC);
 
-               if (conn_obj->intern) {
+               if (!conn_obj->intern) {
+                       throw_exce(EX_UNINITIALIZED TSRMLS_CC, "pq\\Connection not initialized");
+               } else {
                        PGcancel *cancel = PQgetCancel(conn_obj->intern->conn);
 
-                       if (cancel) {
+                       if (!cancel) {
+                               throw_exce(EX_RUNTIME TSRMLS_CC, "Failed to acquire cancel (%s)", PHP_PQerrorMessage(conn_obj->intern->conn));
+                       } else {
                                php_pqcancel_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
 
                                obj->intern = ecalloc(1, sizeof(*obj->intern));
                                obj->intern->cancel = cancel;
                                php_pq_object_addref(conn_obj TSRMLS_CC);
                                obj->intern->conn = conn_obj;
-                       } else {
-                               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to acquire cancel (%s)", PHP_PQerrorMessage(conn_obj->intern->conn));
                        }
-               } else {
-                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "pq\\Connection not initialized");
                }
        }
-       zend_restore_error_handling(&zeh TSRMLS_CC);
 }
 
 ZEND_BEGIN_ARG_INFO_EX(ai_pqcancel_cancel, 0, 0, 0)
 ZEND_END_ARG_INFO();
 static PHP_METHOD(pqcancel, cancel) {
        zend_error_handling zeh;
+       STATUS rv;
 
-       zend_replace_error_handling(EH_THROW, NULL, &zeh TSRMLS_CC);
-       if (SUCCESS == zend_parse_parameters_none()) {
+       zend_replace_error_handling(EH_THROW, exce(EX_INVALID_ARGUMENT), &zeh TSRMLS_CC);
+       rv = zend_parse_parameters_none();
+       zend_restore_error_handling(&zeh TSRMLS_CC);
+
+       if (SUCCESS == rv) {
                php_pqcancel_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
 
-               if (obj->intern) {
-                       char err[256];
+               if (!obj->intern) {
+                       throw_exce(EX_UNINITIALIZED TSRMLS_CC, "pq\\Cancel not initialized");
+               } else {
+                       char err[256] = {0};
 
                        if (!PQcancel(obj->intern->cancel, err, sizeof(err))) {
-                               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to request cancellation: %s", err);
+                               throw_exce(EX_RUNTIME TSRMLS_CC, "Failed to request cancellation (%s)", err);
                        }
-               } else {
-                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "pq\\Cancel not initialized");
                }
        }
-       zend_restore_error_handling(&zeh TSRMLS_CC);
 }
 
 static zend_function_entry php_pqcancel_methods[] = {
@@ -4458,24 +4624,6 @@ static zend_function_entry php_pqcancel_methods[] = {
        {0}
 };
 
-static void php_pqconn_add_eventhandler(zval *zconn, php_pqconn_object_t *conn_obj, const char *type_str, size_t type_len, zval *zevent TSRMLS_DC)
-{
-       zval **evhs;
-
-       if (SUCCESS == zend_hash_find(&conn_obj->intern->eventhandlers, type_str, type_len + 1, (void *) &evhs)) {
-               Z_ADDREF_P(zevent);
-               add_next_index_zval(*evhs, zevent);
-       } else {
-               zval *evh;
-
-               MAKE_STD_ZVAL(evh);
-               array_init(evh);
-               Z_ADDREF_P(zevent);
-               add_next_index_zval(evh, zevent);
-               zend_hash_add(&conn_obj->intern->eventhandlers, type_str, type_len + 1, (void *) &evh, sizeof(zval *), NULL);
-       }
-}
-
 ZEND_BEGIN_ARG_INFO_EX(ai_pqevent_construct, 0, 0, 3)
        ZEND_ARG_OBJ_INFO(0, connection, pq\\Connection, 0)
        ZEND_ARG_INFO(0, type)
@@ -4487,52 +4635,58 @@ static PHP_METHOD(pqevent, __construct) {
        char *type_str;
        int type_len;
        php_pq_callback_t cb;
+       STATUS rv;
 
-       zend_replace_error_handling(EH_THROW, NULL, &zeh TSRMLS_CC);
-       if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "Osf", &zconn, php_pqconn_class_entry, &type_str, &type_len, &cb.fci, &cb.fcc)) {
+       zend_replace_error_handling(EH_THROW, exce(EX_INVALID_ARGUMENT), &zeh TSRMLS_CC);
+       rv = zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "Osf", &zconn, php_pqconn_class_entry, &type_str, &type_len, &cb.fci, &cb.fcc);
+       zend_restore_error_handling(&zeh TSRMLS_CC);
+
+       if (SUCCESS == rv) {
                php_pqconn_object_t *conn_obj = zend_object_store_get_object(zconn TSRMLS_CC);
 
-               if (conn_obj->intern) {
+               if (!conn_obj->intern) {
+                       throw_exce(EX_UNINITIALIZED TSRMLS_CC, "pq\\Connection not initialized");
+               } else {
                        php_pqevent_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
 
                        obj->intern = ecalloc(1, sizeof(*obj->intern));
                        php_pq_callback_addref(&cb);
                        obj->intern->cb = cb;
-                       php_pq_object_addref(conn_obj TSRMLS_CC);
-                       obj->intern->conn = conn_obj;
                        obj->intern->type = estrdup(type_str);
-
-                       php_pqconn_add_eventhandler(zconn, conn_obj, type_str, type_len, getThis() TSRMLS_CC);
-
-               } else {
-                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "pq\\Connection not initialized");
+                       obj->intern->h = php_pqconn_add_eventhandler(conn_obj, type_str, type_len, getThis() TSRMLS_CC);
                }
        }
-       zend_restore_error_handling(&zeh TSRMLS_CC);
 }
 
 ZEND_BEGIN_ARG_INFO_EX(ai_pqevent_trigger, 0, 0, 1)
        ZEND_ARG_ARRAY_INFO(0, args, 1)
 ZEND_END_ARG_INFO();
 static PHP_METHOD(pqevent, trigger) {
+       zend_error_handling zeh;
        zval *args;
+       STATUS rv;
+
+       zend_replace_error_handling(EH_THROW, exce(EX_INVALID_ARGUMENT), &zeh TSRMLS_CC);
+       rv = zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a/", &args);
+       zend_restore_error_handling(&zeh TSRMLS_CC);
 
-       if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a/", &args)) {
+       if (SUCCESS == rv) {
                php_pqevent_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
 
-               if (obj->intern) {
+               if (!obj->intern) {
+                       throw_exce(EX_UNINITIALIZED TSRMLS_CC, "pq\\Event not initialized");
+               } else {
                        zval *rv = NULL;
 
-                       if (SUCCESS == zend_fcall_info_call(&obj->intern->cb.fci, &obj->intern->cb.fcc, &rv, args TSRMLS_CC)) {
+                       if (SUCCESS != zend_fcall_info_call(&obj->intern->cb.fci, &obj->intern->cb.fcc, &rv, args TSRMLS_CC)) {
+                               throw_exce(EX_RUNTIME TSRMLS_CC, "Failed to trigger event");
+                       } else {
                                if (rv) {
                                        RETVAL_ZVAL(rv, 0, 1);
                                } else {
                                        RETVAL_TRUE;
                                }
                        }
-               } else {
-                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "pq\\Event not initialized");
-                       RETVAL_FALSE;
                }
        }
 }
@@ -4552,21 +4706,32 @@ static PHP_METHOD(pqlob, __construct) {
        zend_error_handling zeh;
        zval *ztxn;
        long mode = INV_WRITE|INV_READ, loid = InvalidOid;
+       STATUS rv;
 
-       zend_replace_error_handling(EH_THROW, NULL, &zeh TSRMLS_CC);
-       if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O|ll", &ztxn, php_pqtxn_class_entry, &loid, &mode)) {
-               php_pqtxn_object_t *txn_obj = zend_object_store_get_object(ztxn TSRMLS_CC);
+       zend_replace_error_handling(EH_THROW, exce(EX_INVALID_ARGUMENT), &zeh TSRMLS_CC);
+       rv = zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O|ll", &ztxn, php_pqtxn_class_entry, &loid, &mode);
+       zend_restore_error_handling(&zeh TSRMLS_CC);
 
-               if (txn_obj->intern) {
+       if (SUCCESS == rv) {
+               php_pqtxn_object_t *txn_obj = zend_object_store_get_object(ztxn TSRMLS_CC);
 
+               if (!txn_obj->intern) {
+                       throw_exce(EX_UNINITIALIZED TSRMLS_CC, "pq\\Transaction not initialized");
+               } else if (!txn_obj->intern->open) {
+                       throw_exce(EX_RUNTIME TSRMLS_CC, "pq\\Transation already closed");
+               } else {
                        if (loid == InvalidOid) {
                                loid = lo_creat(txn_obj->intern->conn->intern->conn, mode);
                        }
 
-                       if (loid != InvalidOid) {
+                       if (loid == InvalidOid) {
+                               throw_exce(EX_RUNTIME TSRMLS_CC, "Failed to create large object with mode '%s' (%s)", strmode(mode), PHP_PQerrorMessage(txn_obj->intern->conn->intern->conn));
+                       } else {
                                int lofd = lo_open(txn_obj->intern->conn->intern->conn, loid, mode);
 
-                               if (lofd >= 0) {
+                               if (lofd < 0) {
+                                       throw_exce(EX_RUNTIME TSRMLS_CC, "Failed to open large object with oid=%ld with mode '%s' (%s)", loid, strmode(mode), PHP_PQerrorMessage(txn_obj->intern->conn->intern->conn));
+                               } else {
                                        php_pqlob_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
 
                                        obj->intern = ecalloc(1, sizeof(*obj->intern));
@@ -4574,52 +4739,42 @@ static PHP_METHOD(pqlob, __construct) {
                                        obj->intern->loid = loid;
                                        php_pq_object_addref(txn_obj TSRMLS_CC);
                                        obj->intern->txn = txn_obj;
-                               } else {
-                                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to open large object with mode '%s' (%s)",
-                                                       (mode & (INV_READ|INV_WRITE) ? "rw" :
-                                                                       (mode & INV_READ ? "r" :
-                                                                                       (mode & INV_WRITE ? "w" : "-"))),
-                                                       PHP_PQerrorMessage(txn_obj->intern->conn->intern->conn)
-                                       );
                                }
-                       } else {
-                               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to create large object with mode '%s' (%s)",
-                                               (mode & (INV_READ|INV_WRITE) ? "rw" :
-                                                               (mode & INV_READ ? "r" :
-                                                                               (mode & INV_WRITE ? "w" : "-"))),
-                                               PHP_PQerrorMessage(txn_obj->intern->conn->intern->conn)
-                               );
                        }
-               } else {
-                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "pq\\Transaction not initialized");
+
+                       php_pqconn_notify_listeners(txn_obj->intern->conn TSRMLS_CC);
                }
        }
-       zend_restore_error_handling(&zeh TSRMLS_CC);
 }
 
 ZEND_BEGIN_ARG_INFO_EX(ai_pqlob_write, 0, 0, 1)
        ZEND_ARG_INFO(0, data)
 ZEND_END_ARG_INFO();
 static PHP_METHOD(pqlob, write) {
+       zend_error_handling zeh;
        char *data_str;
        int data_len;
+       STATUS rv;
 
-       if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &data_str, &data_len)) {
+       zend_replace_error_handling(EH_THROW, exce(EX_INVALID_ARGUMENT), &zeh TSRMLS_CC);
+       rv = zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &data_str, &data_len);
+       zend_restore_error_handling(&zeh TSRMLS_CC);
+
+       if (SUCCESS == rv) {
                php_pqlob_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
 
-               if (obj->intern) {
+               if (!obj->intern) {
+                       throw_exce(EX_UNINITIALIZED TSRMLS_CC, "pq\\LOB not initialized");
+               } else {
                        int written = lo_write(obj->intern->txn->intern->conn->intern->conn, obj->intern->lofd, data_str, data_len);
 
-                       if (written >= 0) {
-                               RETVAL_LONG(written);
+                       if (written < 0) {
+                               throw_exce(EX_RUNTIME TSRMLS_CC, "Failed to write to LOB with oid=%ld (%s)", obj->intern->loid, PHP_PQerrorMessage(obj->intern->txn->intern->conn->intern->conn));
                        } else {
-                               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to write to LOB, oid=%d (%s)", obj->intern->loid,
-                                               PHP_PQerrorMessage(obj->intern->txn->intern->conn->intern->conn));
-                               RETVAL_FALSE;
+                               RETVAL_LONG(written);
                        }
-               } else {
-                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "pq\\LOB not initialized");
-                       RETVAL_FALSE;
+
+                       php_pqconn_notify_listeners(obj->intern->txn->intern->conn TSRMLS_CC);
                }
        }
 }
@@ -4629,33 +4784,37 @@ ZEND_BEGIN_ARG_INFO_EX(ai_pqlob_read, 0, 0, 0)
        ZEND_ARG_INFO(1, read)
 ZEND_END_ARG_INFO();
 static PHP_METHOD(pqlob, read) {
+       zend_error_handling zeh;
        long length = 0x1000;
        zval *zread = NULL;
+       STATUS rv;
 
-       if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|lz!", &length, &zread)) {
+       zend_replace_error_handling(EH_THROW, exce(EX_INVALID_ARGUMENT), &zeh TSRMLS_CC);
+       rv = zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|lz!", &length, &zread);
+       zend_restore_error_handling(&zeh TSRMLS_CC);
+
+       if (SUCCESS == rv) {
                php_pqlob_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
 
-               if (obj->intern) {
+               if (!obj->intern) {
+                       throw_exce(EX_UNINITIALIZED TSRMLS_CC, "pq\\LOB not initialized");
+               } else {
                        char *buffer = emalloc(length + 1);
                        int read = lo_read(obj->intern->txn->intern->conn->intern->conn, obj->intern->lofd, buffer, length);
 
-                       if (read >= 0) {
+                       if (read < 0) {
+                               efree(buffer);
+                               throw_exce(EX_RUNTIME TSRMLS_CC, "Failed to read from LOB with oid=%d (%s)", obj->intern->loid, PHP_PQerrorMessage(obj->intern->txn->intern->conn->intern->conn));
+                       } else {
                                if (zread) {
                                        zval_dtor(zread);
                                        ZVAL_LONG(zread, read);
                                }
                                buffer[read] = '\0';
                                RETVAL_STRINGL(buffer, read, 0);
-                       } else {
-                               efree(buffer);
-                               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to read from LOB, oid=%d (%s)", obj->intern->loid,
-                                               PHP_PQerrorMessage(obj->intern->txn->intern->conn->intern->conn));
-                               RETVAL_FALSE;
                        }
 
-               } else {
-                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "pq\\LOB not initialized");
-                       RETVAL_FALSE;
+                       php_pqconn_notify_listeners(obj->intern->txn->intern->conn TSRMLS_CC);
                }
        }
 }
@@ -4665,24 +4824,29 @@ ZEND_BEGIN_ARG_INFO_EX(ai_pqlob_seek, 0, 0, 1)
        ZEND_ARG_INFO(0, whence)
 ZEND_END_ARG_INFO();
 static PHP_METHOD(pqlob, seek) {
+       zend_error_handling zeh;
        long offset, whence = SEEK_SET;
+       STATUS rv;
 
-       if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l|l", &offset, &whence)) {
+       zend_replace_error_handling(EH_THROW, exce(EX_INVALID_ARGUMENT), &zeh TSRMLS_CC);
+       rv = zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l|l", &offset, &whence);
+       zend_restore_error_handling(&zeh TSRMLS_CC);
+
+       if (SUCCESS == rv) {
                php_pqlob_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
 
-               if (obj->intern) {
+               if (!obj->intern) {
+                       throw_exce(EX_UNINITIALIZED TSRMLS_CC, "pq\\LOB not initialized");
+               } else {
                        int position = lo_lseek(obj->intern->txn->intern->conn->intern->conn, obj->intern->lofd, offset, whence);
 
-                       if (position >= 0) {
-                               RETVAL_LONG(position);
+                       if (position < 0) {
+                               throw_exce(EX_RUNTIME TSRMLS_CC, "Failed to seek offset in LOB with oid=%d (%s)", obj->intern->loid,    PHP_PQerrorMessage(obj->intern->txn->intern->conn->intern->conn));
                        } else {
-                               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to seek offset in LOB, oid=%d (%s)", obj->intern->loid,
-                                               PHP_PQerrorMessage(obj->intern->txn->intern->conn->intern->conn));
-                               RETVAL_FALSE;
+                               RETVAL_LONG(position);
                        }
-               } else {
-                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "pq\\LOB not initialized");
-                       RETVAL_FALSE;
+
+                       php_pqconn_notify_listeners(obj->intern->txn->intern->conn TSRMLS_CC);
                }
        }
 }
@@ -4690,22 +4854,28 @@ static PHP_METHOD(pqlob, seek) {
 ZEND_BEGIN_ARG_INFO_EX(ai_pqlob_tell, 0, 0, 0)
 ZEND_END_ARG_INFO();
 static PHP_METHOD(pqlob, tell) {
-       if (SUCCESS == zend_parse_parameters_none()) {
+       zend_error_handling zeh;
+       STATUS rv;
+
+       zend_replace_error_handling(EH_THROW, exce(EX_INVALID_ARGUMENT), &zeh TSRMLS_CC);
+       rv = zend_parse_parameters_none();
+       zend_restore_error_handling(&zeh TSRMLS_CC);
+
+       if (SUCCESS == rv) {
                php_pqlob_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
 
-               if (obj->intern) {
+               if (!obj->intern) {
+                       throw_exce(EX_UNINITIALIZED TSRMLS_CC, "pq\\LOB not initialized");
+               } else {
                        int position = lo_tell(obj->intern->txn->intern->conn->intern->conn, obj->intern->lofd);
 
-                       if (position >= 0) {
-                               RETVAL_LONG(position);
+                       if (position < 0) {
+                               throw_exce(EX_RUNTIME TSRMLS_CC, "Failed to tell offset in LOB with oid=%d (%s)", obj->intern->loid, PHP_PQerrorMessage(obj->intern->txn->intern->conn->intern->conn));
                        } else {
-                               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to tell offset in LOB (oid=%d): %s", obj->intern->loid,
-                                               PHP_PQerrorMessage(obj->intern->txn->intern->conn->intern->conn));
-                               RETVAL_FALSE;
+                               RETVAL_LONG(position);
                        }
-               } else {
-                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "pq\\LOB not initialized");
-                       RETVAL_FALSE;
+
+                       php_pqconn_notify_listeners(obj->intern->txn->intern->conn TSRMLS_CC);
                }
        }
 }
@@ -4714,22 +4884,27 @@ ZEND_BEGIN_ARG_INFO_EX(ai_pqlob_truncate, 0, 0, 0)
        ZEND_ARG_INFO(0, length)
 ZEND_END_ARG_INFO();
 static PHP_METHOD(pqlob, truncate) {
+       zend_error_handling zeh;
        long length = 0;
+       STATUS rv;
+
+       zend_replace_error_handling(EH_THROW, exce(EX_INVALID_ARGUMENT), &zeh TSRMLS_CC);
+       rv = zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|l", &length);
+       zend_restore_error_handling(&zeh TSRMLS_CC);
 
-       if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|l", &length)) {
+       if (SUCCESS == rv) {
                php_pqlob_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
 
-               if (obj->intern) {
-                       if (0 == lo_truncate(obj->intern->txn->intern->conn->intern->conn, obj->intern->lofd, length)) {
-                               RETVAL_TRUE;
-                       } else {
-                               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to truncate LOB (oid=%d): %s", obj->intern->loid,
-                                               PHP_PQerrorMessage(obj->intern->txn->intern->conn->intern->conn));
-                               RETVAL_FALSE;
-                       }
+               if (!obj->intern) {
+                       throw_exce(EX_UNINITIALIZED TSRMLS_CC, "pq\\LOB not initialized");
                } else {
-                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "pq\\LOB not initialized");
-                       RETVAL_FALSE;
+                       int rc = lo_truncate(obj->intern->txn->intern->conn->intern->conn, obj->intern->lofd, length);
+
+                       if (rc != 0) {
+                               throw_exce(EX_RUNTIME TSRMLS_CC, "Failed to truncate LOB with oid=%d (%s)", obj->intern->loid, PHP_PQerrorMessage(obj->intern->txn->intern->conn->intern->conn));
+                       }
+
+                       php_pqconn_notify_listeners(obj->intern->txn->intern->conn TSRMLS_CC);
                }
        }
 }
@@ -4756,35 +4931,45 @@ static PHP_METHOD(pqcopy, __construct) {
        char *expr_str, *opt_str = "";
        int expr_len, opt_len = 0;
        long direction;
+       STATUS rv;
+
+       zend_replace_error_handling(EH_THROW, exce(EX_INVALID_ARGUMENT), &zeh TSRMLS_CC);
+       rv = zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "Osl|s", &zconn, php_pqconn_class_entry, &expr_str, &expr_len, &direction, &opt_str, &opt_len);
+       zend_restore_error_handling(&zeh TSRMLS_CC);
 
-       zend_replace_error_handling(EH_THROW, NULL, &zeh TSRMLS_CC);
-       if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "Osl|s", &zconn, php_pqconn_class_entry, &expr_str, &expr_len, &direction, &opt_str, &opt_len)) {
+       if (SUCCESS == rv) {
                php_pqconn_object_t *conn_obj = zend_object_store_get_object(zconn TSRMLS_CC);
 
-               if (conn_obj->intern) {
-                       char *copy = NULL;
+               if (!conn_obj->intern) {
+                       throw_exce(EX_UNINITIALIZED TSRMLS_CC, "pq\\Connection not initialized");
+               } else {
+                       php_pqcopy_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
+                       smart_str cmd = {0};
+                       PGresult *res;
+
+                       smart_str_appends(&cmd, "COPY ");
+                       smart_str_appendl(&cmd, expr_str, expr_len);
 
                        switch (direction) {
                        case PHP_PQCOPY_FROM_STDIN:
-                               spprintf(&copy, 0, "COPY %s %s %s", expr_str, "FROM STDIN", opt_str);
+                               smart_str_appends(&cmd, " FROM STDIN ");
                                break;
-
                        case PHP_PQCOPY_TO_STDOUT:
-                               spprintf(&copy, 0, "COPY %s %s %s", expr_str, "TO STDOUT", opt_str);
+                               smart_str_appends(&cmd, " TO STDOUT ");
                                break;
-
                        default:
-                               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid COPY direction, expected one of FROM_STDIN (%d) TO_STDOUT (%d), got %ld",
-                                               PHP_PQCOPY_FROM_STDIN, PHP_PQCOPY_TO_STDOUT, direction);
-                               break;
+                               throw_exce(EX_RUNTIME TSRMLS_CC, "Invalid COPY direction, expected one of FROM_STDIN (%d) TO_STDOUT (%d), got %ld", PHP_PQCOPY_FROM_STDIN, PHP_PQCOPY_TO_STDOUT, direction);
+                               smart_str_free(&cmd);
+                               return;
                        }
+                       smart_str_appendl(&cmd, opt_str, opt_len);
+                       smart_str_0(&cmd);
 
-                       if (copy) {
-                               php_pqcopy_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
-                               PGresult *res = PQexec(conn_obj->intern->conn, copy);
-
-                               efree(copy);
+                       res = PQexec(conn_obj->intern->conn, cmd.c);
 
+                       if (!res) {
+                               throw_exce(EX_RUNTIME TSRMLS_CC, "Failed to start %s (%s)", cmd.c, PHP_PQerrorMessage(obj->intern->conn->intern->conn));
+                       } else {
                                if (SUCCESS == php_pqres_success(res TSRMLS_CC)) {
                                        obj->intern = ecalloc(1, sizeof(*obj->intern));
                                        obj->intern->direction = direction;
@@ -4796,11 +4981,11 @@ static PHP_METHOD(pqcopy, __construct) {
 
                                PHP_PQclear(res);
                        }
-               } else {
-                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "pq\\Connection not initialized");
+
+                       smart_str_free(&cmd);
+                       php_pqconn_notify_listeners(obj->intern->conn TSRMLS_CC);
                }
        }
-       zend_restore_error_handling(&zeh TSRMLS_CC);
 }
 
 ZEND_BEGIN_ARG_INFO_EX(ai_pqcopy_put, 0, 0, 1)
@@ -4810,26 +4995,26 @@ static PHP_METHOD(pqcopy, put) {
        zend_error_handling zeh;
        char *data_str;
        int data_len;
+       STATUS rv;
 
-       zend_replace_error_handling(EH_THROW, NULL, &zeh TSRMLS_CC);
-       if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &data_str, &data_len)) {
+       zend_replace_error_handling(EH_THROW, exce(EX_INVALID_ARGUMENT), &zeh TSRMLS_CC);
+       rv = zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &data_str, &data_len);
+       zend_restore_error_handling(&zeh TSRMLS_CC);
+
+       if (SUCCESS == rv) {
                php_pqcopy_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
 
-               if (obj->intern) {
-                       if (PHP_PQCOPY_FROM_STDIN == obj->intern->direction) {
-                               if (1 == PQputCopyData(obj->intern->conn->intern->conn, data_str, data_len)) {
-                                       RETVAL_TRUE;
-                               } else {
-                                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to send COPY data (%s)", PHP_PQerrorMessage(obj->intern->conn->intern->conn));
-                               }
-                       } else {
-                               php_error_docref(NULL TSRMLS_CC, E_WARNING, "pq\\COPY was not initialized with FROM_STDIN");
-                       }
+               if (!obj->intern) {
+                       throw_exce(EX_UNINITIALIZED TSRMLS_CC, "pq\\COPY not initialized");
+               } else if (obj->intern->direction != PHP_PQCOPY_FROM_STDIN) {
+                       throw_exce(EX_RUNTIME TSRMLS_CC, "pq\\COPY was not initialized with FROM_STDIN");
                } else {
-                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "pq\\COPY not initialized");
+                       if (1 != PQputCopyData(obj->intern->conn->intern->conn, data_str, data_len)) {
+                               throw_exce(EX_RUNTIME TSRMLS_CC, "Failed to put COPY data (%s)", PHP_PQerrorMessage(obj->intern->conn->intern->conn));
+                       }
+                       php_pqconn_notify_listeners(obj->intern->conn TSRMLS_CC);
                }
        }
-       zend_restore_error_handling(&zeh TSRMLS_CC);
 }
 
 ZEND_BEGIN_ARG_INFO_EX(ai_pqcopy_end, 0, 0, 0)
@@ -4839,36 +5024,36 @@ static PHP_METHOD(pqcopy, end) {
        zend_error_handling zeh;
        char *error_str = NULL;
        int error_len = 0;
+       STATUS rv;
 
-       zend_replace_error_handling(EH_THROW, NULL, &zeh TSRMLS_CC);
-       if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s!", &error_str, &error_len)) {
-               php_pqcopy_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
+       zend_replace_error_handling(EH_THROW, exce(EX_INVALID_ARGUMENT), &zeh TSRMLS_CC);
+       rv = zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s!", &error_str, &error_len);
+       zend_restore_error_handling(&zeh TSRMLS_CC);
 
-               if (obj->intern) {
-                       if (PHP_PQCOPY_FROM_STDIN == obj->intern->direction) {
-                               if (1 == PQputCopyEnd(obj->intern->conn->intern->conn, error_str)) {
-                                       PGresult *res = PQgetResult(obj->intern->conn->intern->conn);
+       if (SUCCESS == rv) {
+               php_pqcopy_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
 
-                                       if (res) {
-                                               if (SUCCESS == php_pqres_success(res TSRMLS_CC)) {
-                                                       RETVAL_TRUE;
-                                               }
+               if (!obj->intern) {
+                       throw_exce(EX_RUNTIME TSRMLS_CC, "pq\\COPY not intitialized");
+               } else if (obj->intern->direction != PHP_PQCOPY_FROM_STDIN) {
+                       throw_exce(EX_RUNTIME TSRMLS_CC, "pq\\COPY was not intitialized with FROM_STDIN");
+               } else {
+                       if (1 != PQputCopyEnd(obj->intern->conn->intern->conn, error_str)) {
+                               throw_exce(EX_RUNTIME TSRMLS_CC, "Failed to end COPY (%s)", PHP_PQerrorMessage(obj->intern->conn->intern->conn));
+                       } else {
+                               PGresult *res = PQgetResult(obj->intern->conn->intern->conn);
 
-                                               PHP_PQclear(res);
-                                       } else {
-                                               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to get COPY result (%s)", PHP_PQerrorMessage(obj->intern->conn->intern->conn));
-                                       }
+                               if (!res) {
+                                       throw_exce(EX_RUNTIME TSRMLS_CC, "Failed to fetch COPY result (%s)", PHP_PQerrorMessage(obj->intern->conn->intern->conn));
                                } else {
-                                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to end COPY (%s)", PHP_PQerrorMessage(obj->intern->conn->intern->conn));
+                                       php_pqres_success(res TSRMLS_CC);
+                                       PHP_PQclear(res);
                                }
-                       } else {
-                               php_error_docref(NULL TSRMLS_CC, E_WARNING, "pq\\COPY was not initialized with FROM_STDIN");
                        }
-               } else {
-                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "pq\\COPY not initialized");
+
+                       php_pqconn_notify_listeners(obj->intern->conn TSRMLS_CC);
                }
        }
-       zend_restore_error_handling(&zeh TSRMLS_CC);
 }
 
 ZEND_BEGIN_ARG_INFO_EX(ai_pqcopy_get, 0, 0, 1)
@@ -4877,54 +5062,57 @@ ZEND_END_ARG_INFO();
 static PHP_METHOD(pqcopy, get) {
        zend_error_handling zeh;
        zval *zdata;
+       STATUS rv;
 
-       zend_replace_error_handling(EH_THROW, NULL, &zeh TSRMLS_CC);
-       if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &zdata)) {
-               php_pqcopy_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
-               char *buffer = NULL;
-
-               if (obj->intern) {
-                       if (PHP_PQCOPY_TO_STDOUT == obj->intern->direction) {
-                               PGresult *res;
-                               int bytes = PQgetCopyData(obj->intern->conn->intern->conn, &buffer, 0);
+       zend_replace_error_handling(EH_THROW, exce(EX_INVALID_ARGUMENT), &zeh TSRMLS_CC);
+       rv = zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &zdata);
+       zend_restore_error_handling(&zeh TSRMLS_CC);
 
-                               switch (bytes) {
-                               case -1:
-                                       res = PQgetResult(obj->intern->conn->intern->conn);
+       if (SUCCESS == rv) {
+               php_pqcopy_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
 
-                                       if (res) {
-                                               if (SUCCESS == php_pqres_success(res TSRMLS_CC)) {
-                                                       RETVAL_FALSE;
-                                               }
+               if (!obj->intern) {
+                       throw_exce(EX_UNINITIALIZED TSRMLS_CC, "pq\\COPY not initialized");
+               } else if (obj->intern->direction != PHP_PQCOPY_TO_STDOUT) {
+                       throw_exce(EX_RUNTIME TSRMLS_CC, "pq\\COPY was not intialized with TO_STDOUT");
+               } else {
+                       PGresult *res;
+                       char *buffer = NULL;
+                       int bytes = PQgetCopyData(obj->intern->conn->intern->conn, &buffer, 0);
 
-                                               PHP_PQclear(res);
-                                       } else {
-                                               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to get COPY result (%s)", PHP_PQerrorMessage(obj->intern->conn->intern->conn));
-                                       }
-                                       break;
+                       switch (bytes) {
+                       case -2:
+                               throw_exce(EX_RUNTIME TSRMLS_CC, "Failed to fetch COPY data (%s)", PHP_PQerrorMessage(obj->intern->conn->intern->conn));
+                               break;
 
-                               case -2:
-                                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to get COPY data (%s)", PHP_PQerrorMessage(obj->intern->conn->intern->conn));
-                                       break;
+                       case -1:
+                               res = PQgetResult(obj->intern->conn->intern->conn);
 
-                               default:
-                                       zval_dtor(zdata);
-                                       if (buffer) {
-                                               ZVAL_STRINGL(zdata, buffer, bytes, 1);
-                                       } else {
-                                               ZVAL_EMPTY_STRING(zdata);
-                                       }
-                                       RETVAL_TRUE;
-                                       break;
+                               if (!res) {
+                                       throw_exce(EX_RUNTIME TSRMLS_CC, "Failed to fetch COPY result (%s)", PHP_PQerrorMessage(obj->intern->conn->intern->conn));
+                               } else {
+                                       php_pqres_success(res TSRMLS_CC);
+                                       PHP_PQclear(res);
+                                       RETVAL_FALSE;
                                }
+                               break;
 
+                       default:
+                               zval_dtor(zdata);
                                if (buffer) {
-                                       PQfreemem(buffer);
+                                       ZVAL_STRINGL(zdata, buffer, bytes, 1);
+                               } else {
+                                       ZVAL_EMPTY_STRING(zdata);
                                }
+                               RETVAL_TRUE;
+                               break;
+                       }
+
+                       if (buffer) {
+                               PQfreemem(buffer);
                        }
                }
        }
-       zend_restore_error_handling(&zeh TSRMLS_CC);
 }
 
 static zend_function_entry php_pqcopy_methods[] = {
@@ -4949,26 +5137,37 @@ static PHP_MINIT_FUNCTION(pq)
        INIT_NS_CLASS_ENTRY(ce, "pq", "Exception", php_pqexc_methods);
        php_pqexc_interface_class_entry = zend_register_internal_interface(&ce TSRMLS_CC);
 
-       memset(&ce, 0, sizeof(ce));
-       INIT_NS_CLASS_ENTRY(ce, "pq\\Exception", "Exception", php_pqexc_methods);
-       php_pqexc_default_class_entry = zend_register_internal_class_ex(&ce, zend_exception_get_default(TSRMLS_C), "Exception" TSRMLS_CC);
-       zend_class_implements(php_pqexc_default_class_entry TSRMLS_CC, 1, php_pqexc_interface_class_entry);
+       zend_declare_class_constant_long(php_pqexc_interface_class_entry, ZEND_STRL("INVALID_ARGUMENT"), EX_INVALID_ARGUMENT TSRMLS_CC);
+       zend_declare_class_constant_long(php_pqexc_interface_class_entry, ZEND_STRL("RUNTIME"), EX_RUNTIME TSRMLS_CC);
+       zend_declare_class_constant_long(php_pqexc_interface_class_entry, ZEND_STRL("CONNECTION_FAILED"), EX_CONNECTION_FAILED TSRMLS_CC);
+       zend_declare_class_constant_long(php_pqexc_interface_class_entry, ZEND_STRL("IO"), EX_IO TSRMLS_CC);
+       zend_declare_class_constant_long(php_pqexc_interface_class_entry, ZEND_STRL("ESCAPE"), EX_ESCAPE TSRMLS_CC);
+       zend_declare_class_constant_long(php_pqexc_interface_class_entry, ZEND_STRL("BAD_METHODCALL"), EX_BAD_METHODCALL TSRMLS_CC);
+       zend_declare_class_constant_long(php_pqexc_interface_class_entry, ZEND_STRL("UNINITIALIZED"), EX_UNINITIALIZED TSRMLS_CC);
+       zend_declare_class_constant_long(php_pqexc_interface_class_entry, ZEND_STRL("DOMAIN"), EX_DOMAIN TSRMLS_CC);
+       zend_declare_class_constant_long(php_pqexc_interface_class_entry, ZEND_STRL("SQL"), EX_SQL TSRMLS_CC);
 
        memset(&ce, 0, sizeof(ce));
-       INIT_NS_CLASS_ENTRY(ce, "pq\\Exception", "InvalidArgument", php_pqexc_methods);
+       INIT_NS_CLASS_ENTRY(ce, "pq\\Exception", "InvalidArgumentException", php_pqexc_methods);
        php_pqexc_invalid_argument_class_entry = zend_register_internal_class_ex(&ce, spl_ce_InvalidArgumentException, "InvalidArgumentException" TSRMLS_CC);
        zend_class_implements(php_pqexc_invalid_argument_class_entry TSRMLS_CC, 1, php_pqexc_interface_class_entry);
 
        memset(&ce, 0, sizeof(ce));
-       INIT_NS_CLASS_ENTRY(ce, "pq\\Exception", "Runtime", php_pqexc_methods);
+       INIT_NS_CLASS_ENTRY(ce, "pq\\Exception", "RuntimeException", php_pqexc_methods);
        php_pqexc_runtime_class_entry = zend_register_internal_class_ex(&ce, spl_ce_RuntimeException, "RuntimeException" TSRMLS_CC);
        zend_class_implements(php_pqexc_runtime_class_entry TSRMLS_CC, 1, php_pqexc_interface_class_entry);
 
        memset(&ce, 0, sizeof(ce));
-       INIT_NS_CLASS_ENTRY(ce, "pq\\Exception", "BadMethodCall", php_pqexc_methods);
+       INIT_NS_CLASS_ENTRY(ce, "pq\\Exception", "BadMethodCallException", php_pqexc_methods);
        php_pqexc_bad_methodcall_class_entry = zend_register_internal_class_ex(&ce, spl_ce_BadMethodCallException, "BadMethodCallException" TSRMLS_CC);
        zend_class_implements(php_pqexc_bad_methodcall_class_entry TSRMLS_CC, 1, php_pqexc_interface_class_entry);
 
+       memset(&ce, 0, sizeof(ce));
+       INIT_NS_CLASS_ENTRY(ce, "pq\\Exception", "DomainException", php_pqexc_methods);
+       php_pqexc_domain_class_entry = zend_register_internal_class_ex(&ce, spl_ce_DomainException, "DomainException" TSRMLS_CC);
+       zend_class_implements(php_pqexc_domain_class_entry TSRMLS_CC, 1, php_pqexc_interface_class_entry);
+       zend_declare_property_null(php_pqexc_domain_class_entry, ZEND_STRL("sqlstate"), ZEND_ACC_PUBLIC TSRMLS_CC);
+
        memset(&ce, 0, sizeof(ce));
        INIT_NS_CLASS_ENTRY(ce, "pq", "Connection", php_pqconn_methods);
        php_pqconn_class_entry = zend_register_internal_class_ex(&ce, NULL, NULL TSRMLS_CC);
@@ -4981,7 +5180,7 @@ static PHP_MINIT_FUNCTION(pq)
        php_pqconn_object_handlers.get_property_ptr_ptr = NULL;
        php_pqconn_object_handlers.get_debug_info = php_pq_object_debug_info;
 
-       zend_hash_init(&php_pqconn_object_prophandlers, 13, NULL, NULL, 1);
+       zend_hash_init(&php_pqconn_object_prophandlers, 14, NULL, NULL, 1);
 
        zend_declare_property_long(php_pqconn_class_entry, ZEND_STRL("status"), CONNECTION_BAD, ZEND_ACC_PUBLIC TSRMLS_CC);
        ph.read = php_pqconn_object_read_status;
@@ -5039,6 +5238,10 @@ static PHP_MINIT_FUNCTION(pq)
        ph.read = php_pqconn_object_read_options;
        zend_hash_add(&php_pqconn_object_prophandlers, "options", sizeof("options"), (void *) &ph, sizeof(ph), NULL);
 
+       zend_declare_property_null(php_pqconn_class_entry, ZEND_STRL("eventHandlers"), ZEND_ACC_PUBLIC TSRMLS_CC);
+       ph.read = php_pqconn_object_read_event_handlers;
+       zend_hash_add(&php_pqconn_object_prophandlers, "eventHandlers", sizeof("eventHandlers"), (void *) &ph, sizeof(ph), NULL);
+
        zend_declare_class_constant_long(php_pqconn_class_entry, ZEND_STRL("OK"), CONNECTION_OK TSRMLS_CC);
        zend_declare_class_constant_long(php_pqconn_class_entry, ZEND_STRL("BAD"), CONNECTION_BAD TSRMLS_CC);
        zend_declare_class_constant_long(php_pqconn_class_entry, ZEND_STRL("STARTED"), CONNECTION_STARTED TSRMLS_CC);
@@ -5191,19 +5394,19 @@ static PHP_MINIT_FUNCTION(pq)
        ph.write = php_pqtxn_object_write_isolation;
        zend_hash_add(&php_pqtxn_object_prophandlers, "isolation", sizeof("isolation"), (void *) &ph, sizeof(ph), NULL);
 
-       zend_declare_property_null(php_pqtxn_class_entry, ZEND_STRL("readonly"), ZEND_ACC_PUBLIC TSRMLS_CC);
+       zend_declare_property_bool(php_pqtxn_class_entry, ZEND_STRL("readonly"), 0, ZEND_ACC_PUBLIC TSRMLS_CC);
        ph.read = php_pqtxn_object_read_readonly;
        ph.write = php_pqtxn_object_write_readonly;
        zend_hash_add(&php_pqtxn_object_prophandlers, "readonly", sizeof("readonly"), (void *) &ph, sizeof(ph), NULL);
 
-       zend_declare_property_null(php_pqtxn_class_entry, ZEND_STRL("deferrable"), ZEND_ACC_PUBLIC TSRMLS_CC);
+       zend_declare_property_bool(php_pqtxn_class_entry, ZEND_STRL("deferrable"), 0, ZEND_ACC_PUBLIC TSRMLS_CC);
        ph.read = php_pqtxn_object_read_deferrable;
        ph.write = php_pqtxn_object_write_deferrable;
        zend_hash_add(&php_pqtxn_object_prophandlers, "deferrable", sizeof("deferrable"), (void *) &ph, sizeof(ph), NULL);
        ph.write = NULL;
 
        zend_declare_class_constant_long(php_pqtxn_class_entry, ZEND_STRL("READ_COMMITTED"), PHP_PQTXN_READ_COMMITTED TSRMLS_CC);
-       zend_declare_class_constant_long(php_pqtxn_class_entry, ZEND_STRL("REPEATABLE READ"), PHP_PQTXN_REPEATABLE_READ TSRMLS_CC);
+       zend_declare_class_constant_long(php_pqtxn_class_entry, ZEND_STRL("REPEATABLE_READ"), PHP_PQTXN_REPEATABLE_READ TSRMLS_CC);
        zend_declare_class_constant_long(php_pqtxn_class_entry, ZEND_STRL("SERIALIZABLE"), PHP_PQTXN_SERIALIZABLE TSRMLS_CC);
 
        memset(&ce, 0, sizeof(ce));
@@ -5236,11 +5439,7 @@ static PHP_MINIT_FUNCTION(pq)
        php_pqevent_object_handlers.get_property_ptr_ptr = NULL;
        php_pqevent_object_handlers.get_debug_info = php_pq_object_debug_info;
 
-       zend_hash_init(&php_pqevent_object_prophandlers, 2, NULL, NULL, 1);
-
-       zend_declare_property_null(php_pqevent_class_entry, ZEND_STRL("connection"), ZEND_ACC_PUBLIC TSRMLS_CC);
-       ph.read = php_pqevent_object_read_connection;
-       zend_hash_add(&php_pqevent_object_prophandlers, "connection", sizeof("connection"), (void *) &ph, sizeof(ph), NULL);
+       zend_hash_init(&php_pqevent_object_prophandlers, 1, NULL, NULL, 1);
 
        zend_declare_property_null(php_pqevent_class_entry, ZEND_STRL("type"), ZEND_ACC_PUBLIC TSRMLS_CC);
        ph.read = php_pqevent_object_read_type;