diff --git a/build.gradle b/build.gradle
deleted file mode 100644
index a87d144f7..000000000
--- a/build.gradle
+++ /dev/null
@@ -1,44 +0,0 @@
-apply plugin: 'java'
-apply plugin: 'idea'
-apply plugin: 'maven'
-
-
-repositories {
-    mavenLocal()
-    mavenCentral()
-}
-
-group = 'org.java_websocket'
-version = '1.2.1-SNAPSHOT'
-sourceCompatibility = 1.6
-targetCompatibility = 1.6
-
-configurations {
-    deployerJars
-}
-
-configure(install.repositories.mavenInstaller) {
-    pom.version = project.version
-    pom.groupId = "org.java_websocket"
-    pom.artifactId = 'Java-WebSocket'
-}
-
-dependencies {
-	deployerJars "org.apache.maven.wagon:wagon-webdav:1.0-beta-2"
-}
-
-
-//deploy to maven repository
-//uploadArchives {
-//    repositories.mavenDeployer {
-//        configuration = configurations.deployerJars
-//        repository(url: repositoryUrl) {
-//			authentication(userName: repositoryUsername, password: repositoryPassword)
-//		}
-//    }
-//}
-
-task wrapper(type: Wrapper) {
-    gradleVersion = '1.4'
-}
-
diff --git a/pom.xml b/pom.xml
index 0316b921c..7f08fe026 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,9 +11,9 @@
         <url>git@github.com:TooTallNate/Java-WebSocket.git</url>
     </scm>
     <modelVersion>4.0.0</modelVersion>
-    <groupId>org.java-websocket</groupId>
+    <groupId>com.github.desertkun</groupId>
     <artifactId>Java-WebSocket</artifactId>
-    <version>1.3.1-SNAPSHOT</version>
+    <version>1.3.1-dev</version>
     <packaging>jar</packaging>
     <name>Java WebSocket</name>
     <url>http://java-websocket.org/</url>
diff --git a/src/main/java/org/java_websocket/drafts/Draft_10.java b/src/main/java/org/java_websocket/drafts/Draft_10.java
index 305460a52..ffce55241 100644
--- a/src/main/java/org/java_websocket/drafts/Draft_10.java
+++ b/src/main/java/org/java_websocket/drafts/Draft_10.java
@@ -67,6 +67,10 @@ public static int readVersion( Handshakedata handshakedata ) {
 
 	@Override
 	public HandshakeState acceptHandshakeAsClient( ClientHandshake request, ServerHandshake response ) throws InvalidHandshakeException {
+
+		if (request == null || response == null)
+			return HandshakeState.NOT_MATCHED;
+
 		if( !request.hasFieldValue( "Sec-WebSocket-Key" ) || !response.hasFieldValue( "Sec-WebSocket-Accept" ) )
 			return HandshakeState.NOT_MATCHED;