diff --git a/Documentation/MaxScale 1.0beta Release Notes.pdf b/Documentation/MaxScale 1.0beta Release Notes.pdf
new file mode 100644
index 000000000..165a9a1b5
Binary files /dev/null and b/Documentation/MaxScale 1.0beta Release Notes.pdf differ
diff --git a/Documentation/MaxScale 0.7 Release Notes.pdf b/Documentation/history/MaxScale 0.7 Release Notes.pdf
similarity index 100%
rename from Documentation/MaxScale 0.7 Release Notes.pdf
rename to Documentation/history/MaxScale 0.7 Release Notes.pdf
diff --git a/debian/changelog b/debian/changelog
index eeffe8a63..e416d995a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,8 @@
+maxscale (1.0-beta) UNRELEASED; urgency=low
+
+  * Beta release
+
+ -- Timofey Turenko <timofey.turenko@skysql.com>  Fri, 05 Jul 2014 14:00:00 +0200
 maxscale (0.7-1) UNRELEASED; urgency=low
 
   * Initial release. (Closes: #XXXXXX)
diff --git a/debian/files b/debian/files
deleted file mode 100644
index cdd732fd3..000000000
--- a/debian/files
+++ /dev/null
@@ -1 +0,0 @@
-maxscale_0.7-1_amd64.deb misc optional
diff --git a/maxscale.spec b/maxscale.spec
index 5d04cc8e1..93c1b9174 100644
--- a/maxscale.spec
+++ b/maxscale.spec
@@ -1,7 +1,7 @@
 %define _topdir         %(echo $PWD)/
 %define name            maxscale
-%define release         1
-%define version         0.7
+%define release         beta
+%define version         1.0
 %define install_path    /usr/local/skysql/maxscale/
 
 BuildRoot:              %{buildroot}
diff --git a/server/modules/protocol/mysql_backend.c b/server/modules/protocol/mysql_backend.c
index acb1f8488..6c101204e 100644
--- a/server/modules/protocol/mysql_backend.c
+++ b/server/modules/protocol/mysql_backend.c
@@ -778,8 +778,16 @@ static int gw_error_backend_event(DCB *dcb)
                 LOGFILE_ERROR,
                 "Backend error event handling.")));
 #endif
-        
-        
+        /**
+         * Avoid running redundant error handling procedure.
+         * dcb_close is already called for the DCB. Thus, either connection is
+         * closed by router and COM_QUIT sent or there was an error which
+         * have already been handled.
+         */
+        if (dcb->session != DCB_STATE_POLLING)
+        {
+                return 1;
+        }
         errbuf = mysql_create_custom_error(
                 1, 
                 0,