diff --git a/example/test.go b/example/test.go
index 4759dbc..7022235 100644
--- a/example/test.go
+++ b/example/test.go
@@ -1,7 +1,7 @@
 package main
 
 import (
-	"irc"
+	irc "github.com/thoj/Go-IRC-Client-Library"
 	"fmt"
 	"os"
 )
diff --git a/irc.go b/irc.go
index 14517db..ad5fef9 100644
--- a/irc.go
+++ b/irc.go
@@ -48,7 +48,7 @@ func reader(irc *IRCConnection) {
 		if len(args) > 1 {
 			event.Message = args[1]
 		}
-		args = strings.Split(args[0], " ", 0)
+		args = strings.Split(args[0], " ", -1)
 		event.Code = strings.ToUpper(args[0])
 		if len(args) > 1 {
 			event.Arguments = args[1:len(args)]
@@ -61,6 +61,9 @@ func reader(irc *IRCConnection) {
 func writer(irc *IRCConnection) {
 	for !error {
 		b := []byte(<-irc.pwrite)
+		if b == nil {
+			return
+		}
 		_, err := irc.socket.Write(b)
 		if err != nil {
 			fmt.Printf("%s\n", err)
diff --git a/irc_callback.go b/irc_callback.go
index 83dcbd5..10ff827 100644
--- a/irc_callback.go
+++ b/irc_callback.go
@@ -91,7 +91,11 @@ func (irc *IRCConnection) setupCallbacks() {
 	})
 
 	irc.AddCallback("433", func(e *IRCEvent) {
-		irc.nick = irc.nick + "_"
+		if len(irc.nick) > 8 {
+			irc.nick = "_" + irc.nick;
+		} else {
+			irc.nick = irc.nick + "_"
+		}
 		irc.SendRaw(fmt.Sprintf("NICK %s", irc.nick))
 	})