diff --git a/library.c b/library.c
index 94191e6..598bdfd 100644
--- a/library.c
+++ b/library.c
@@ -25,8 +25,6 @@ void kafka_err_cb (rd_kafka_t *rk, int err, const char *reason, void *opaque) {
     openlog("phpkafka", 0, LOG_USER);
     syslog(LOG_INFO, "phpkafka - ERROR CALLBACK: %s: %s: %s\n", 
             rd_kafka_name(rk), rd_kafka_err2str(err), reason);
-    
-    kafka_stop(err);
 }
 
 void kafka_msg_delivered (rd_kafka_t *rk,
@@ -86,7 +84,7 @@ void kafka_produce(char* topic, char* msg, int msg_len)
     signal(SIGPIPE, kafka_stop);
     
     rd_kafka_topic_t *rkt;
-    int partition = 0;
+    int partition = RD_KAFKA_PARTITION_UA;
     
     /* Create topic */
     rkt = rd_kafka_topic_new(rk, topic, NULL);