diff --git a/context.go b/context.go
index 4547242..095b16d 100644
--- a/context.go
+++ b/context.go
@@ -49,13 +49,12 @@ func GetOk(r *http.Request, key interface{}) (interface{}, bool) {
 }
 
 // GetAll returns all stored values for the request as a map.
-func GetAll(r *http.Request) (map[interface{}]interface{}, bool) {
+func GetAll(r *http.Request) map[interface{}]interface{} {
 	mutex.Lock()
 	defer mutex.Unlock()
-	if all, ok := data[r]; ok {
-		return all, ok
-	}
-	return nil, false
+
+	context, _ := data[r]
+	return context
 }
 
 // Delete removes a value stored for a given key in a given request.
diff --git a/context_test.go b/context_test.go
index 817a749..ddbf3c7 100644
--- a/context_test.go
+++ b/context_test.go
@@ -53,13 +53,12 @@ func TestContext(t *testing.T) {
 	assertEqual(ok, true)
 
 	// GetAll()
-	values, ok := GetAll(r)
-	assertEqual(ok, true)
+	values := GetAll(r)
 	assertEqual(len(values), 3)
 
 	// GetAll() for empty request
-	values, ok = GetAll(emptyR)
-	assertEqual(ok, false)
+	values = GetAll(emptyR)
+	assertEqual(len(values), 0)
 
 	// Delete()
 	Delete(r, key1)