diff --git a/.gitignore b/.gitignore
index 9f03361f7129fca9258961dd53bc90023155fd01..62d17d343d1b27f52c143eea6eab0920bc7619ab 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,6 +27,8 @@ localdev_*
 *.class
 *.aar
 *.jar
-# Ignore test output
+# Ignore test output related to ekv
 .ekv*
 .*test*
+*.1
+*.2
diff --git a/api/client.go b/api/client.go
index e4681316d1f556573b3bc078e8977c7e626368b5..37930e50fb515e84b0c2b4707e71ae66589e1ada 100644
--- a/api/client.go
+++ b/api/client.go
@@ -441,7 +441,7 @@ type SearchCallback interface {
 func (cl *Client) SearchForUser(emailAddress string,
 	cb SearchCallback, timeout time.Duration) {
 	//see if the user has been searched before, if it has, return it
-	contact, err := io.SessionV2.GetContact(emailAddress)
+	contact, err := cl.sessionV2.GetContact(emailAddress)
 
 	// if we successfully got the contact, return it.
 	// errors can include the email address not existing,
@@ -462,7 +462,7 @@ func (cl *Client) SearchForUser(emailAddress string,
 				return
 			}
 			//store the user so future lookups can find it
-			io.SessionV2.SetContact(emailAddress, contact)
+			err = cl.sessionV2.SetContact(emailAddress, contact)
 
 			// If there is something in the channel then send it; otherwise,
 			// skip over it