diff --git a/session/environment.go b/session/environment.go
index 6df23f62..3a2c2cb6 100644
--- a/session/environment.go
+++ b/session/environment.go
@@ -113,16 +113,16 @@ func (env *Environment) Get(name string) (bool, string) {
 	return env.GetUnlocked(name)
 }
 
-func (env *Environment) GetInt(name string) (error, int) {
+func (env *Environment) GetInt(name string) (int, error) {
 	if found, value := env.Get(name); found {
 		if i, err := strconv.Atoi(value); err == nil {
-			return nil, i
+			return i, nil
 		} else {
-			return err, 0
+			return 0, err
 		}
 	}
 
-	return fmt.Errorf("Not found."), 0
+	return 0, fmt.Errorf("Not found.")
 }
 
 func (env *Environment) Sorted() []string {
diff --git a/session/environment_test.go b/session/environment_test.go
index 5edcc0ee..2325fe44 100644
--- a/session/environment_test.go
+++ b/session/environment_test.go
@@ -252,19 +252,19 @@ func TestSessionEnvironmentGetInt(t *testing.T) {
 	}
 
 	for k := range testEnvData {
-		if err, _ := env.GetInt(k); err == nil {
+		if _, err := env.GetInt(k); err == nil {
 			t.Fatal("expected error")
 		}
 	}
 
 	env.Data["num"] = "1234"
-	if err, i := env.GetInt("num"); err != nil {
+	if i, err := env.GetInt("num"); err != nil {
 		t.Fatalf("unexpected error: %v", err)
 	} else if i != 1234 {
 		t.Fatalf("unexpected integer: %d", i)
 	}
 
-	if err, _ := env.GetInt("unknownint"); err == nil {
+	if _, err := env.GetInt("unknownint"); err == nil {
 		t.Fatalf("expected error (unknown key): %v", err)
 	}
 }