2 files changed, 5 insertions, 2 deletions
diff --git a/src/php/ext/grpc/server.c b/src/php/ext/grpc/server.c
index cb7b188b0e..8c7eaee203 100644
--- a/src/php/ext/grpc/server.c
+++ b/src/php/ext/grpc/server.c
@@ -75,7 +75,10 @@ PHP_METHOD(Server, __construct) {
   if (args_array == NULL) {
     server->wrapped = grpc_server_create(NULL, NULL);
   } else {
-    php_grpc_read_args_array(args_array, &args TSRMLS_CC);
+    if (php_grpc_read_args_array(args_array, &args TSRMLS_CC) == FAILURE) {
+      efree(args.args);
+      return;
+    }
     server->wrapped = grpc_server_create(&args, NULL);
     efree(args.args);
   }
diff --git a/src/php/ext/grpc/version.h b/src/php/ext/grpc/version.h
index 99dd9d68f0..469a48e782 100644
--- a/src/php/ext/grpc/version.h
+++ b/src/php/ext/grpc/version.h
@@ -20,6 +20,6 @@
 #ifndef VERSION_H
 #define VERSION_H
 
-#define PHP_GRPC_VERSION "1.15.0dev"
+#define PHP_GRPC_VERSION "1.16.0dev"
 
 #endif /* VERSION_H */