diff --git a/modules/any_proxy/any_proxy.go b/modules/any_proxy/any_proxy.go
index a8977d27..f019e024 100644
--- a/modules/any_proxy/any_proxy.go
+++ b/modules/any_proxy/any_proxy.go
@@ -85,9 +85,9 @@ func (mod *AnyProxy) Configure() error {
 		return err
 	} else if err, protocol = mod.StringParam("any.proxy.protocol"); err != nil {
 		return err
-	} else if err, srcPort = mod.IntParam("any.proxy.src_port"); err != nil {
+	} else if srcPort, err = mod.IntParam("any.proxy.src_port"); err != nil {
 		return err
-	} else if err, dstPort = mod.IntParam("any.proxy.dst_port"); err != nil {
+	} else if dstPort, err = mod.IntParam("any.proxy.dst_port"); err != nil {
 		return err
 	} else if err, srcAddress = mod.StringParam("any.proxy.src_address"); err != nil {
 		return err
diff --git a/modules/api_rest/api_rest.go b/modules/api_rest/api_rest.go
index 2fe63010..34df4ccf 100644
--- a/modules/api_rest/api_rest.go
+++ b/modules/api_rest/api_rest.go
@@ -191,7 +191,7 @@ func (mod *RestAPI) Configure() error {
 		return session.ErrAlreadyStarted(mod.Name())
 	} else if err, ip = mod.StringParam("api.rest.address"); err != nil {
 		return err
-	} else if err, port = mod.IntParam("api.rest.port"); err != nil {
+	} else if port, err = mod.IntParam("api.rest.port"); err != nil {
 		return err
 	} else if err, mod.allowOrigin = mod.StringParam("api.rest.alloworigin"); err != nil {
 		return err
diff --git a/modules/api_rest/api_rest_record.go b/modules/api_rest/api_rest_record.go
index bd04ecaa..eae1ef43 100644
--- a/modules/api_rest/api_rest_record.go
+++ b/modules/api_rest/api_rest_record.go
@@ -82,7 +82,7 @@ func (mod *RestAPI) startRecording(filename string) (err error) {
 		return mod.errAlreadyRecording()
 	} else if mod.replaying {
 		return mod.errAlreadyReplaying()
-	} else if err, mod.recClock = mod.IntParam("api.rest.record.clock"); err != nil {
+	} else if mod.recClock, err = mod.IntParam("api.rest.record.clock"); err != nil {
 		return err
 	} else if mod.recordFileName, err = fs.Expand(filename); err != nil {
 		return err
diff --git a/modules/ble/ble_recon.go b/modules/ble/ble_recon.go
index db00ded3..a1440b8c 100644
--- a/modules/ble/ble_recon.go
+++ b/modules/ble/ble_recon.go
@@ -157,7 +157,7 @@ func (mod *BLERecon) Configure() (err error) {
 	if mod.Running() {
 		return session.ErrAlreadyStarted(mod.Name())
 	} else if mod.gattDevice == nil {
-		if err, mod.deviceId = mod.IntParam("ble.device"); err != nil {
+		if mod.deviceId, err = mod.IntParam("ble.device"); err != nil {
 			return err
 		}
 
@@ -180,9 +180,9 @@ func (mod *BLERecon) Configure() (err error) {
 		mod.gattDevice.Init(mod.onStateChanged)
 	}
 
-	if err, mod.connTimeout = mod.IntParam("ble.timeout"); err != nil {
+	if mod.connTimeout, err = mod.IntParam("ble.timeout"); err != nil {
 		return err
-	} else if err, mod.devTTL = mod.IntParam("ble.ttl"); err != nil {
+	} else if mod.devTTL, err = mod.IntParam("ble.ttl"); err != nil {
 		return err
 	}
 
diff --git a/modules/gps/gps.go b/modules/gps/gps.go
index a6d519c5..3d89cb39 100644
--- a/modules/gps/gps.go
+++ b/modules/gps/gps.go
@@ -75,7 +75,7 @@ func (mod *GPS) Configure() (err error) {
 		return session.ErrAlreadyStarted(mod.Name())
 	} else if err, mod.serialPort = mod.StringParam("gps.device"); err != nil {
 		return err
-	} else if err, mod.baudRate = mod.IntParam("gps.baudrate"); err != nil {
+	} else if mod.baudRate, err = mod.IntParam("gps.baudrate"); err != nil {
 		return err
 	}
 
diff --git a/modules/hid/hid.go b/modules/hid/hid.go
index cb16b146..de42e955 100644
--- a/modules/hid/hid.go
+++ b/modules/hid/hid.go
@@ -176,23 +176,23 @@ func (mod *HIDRecon) Configure() error {
 		return err
 	}
 
-	if err, mod.devTTL = mod.IntParam("hid.ttl"); err != nil {
+	if mod.devTTL, err = mod.IntParam("hid.ttl"); err != nil {
 		return err
 	}
 
-	if err, n = mod.IntParam("hid.hop.period"); err != nil {
+	if n, err = mod.IntParam("hid.hop.period"); err != nil {
 		return err
 	} else {
 		mod.hopPeriod = time.Duration(n) * time.Millisecond
 	}
 
-	if err, n = mod.IntParam("hid.ping.period"); err != nil {
+	if n, err = mod.IntParam("hid.ping.period"); err != nil {
 		return err
 	} else {
 		mod.pingPeriod = time.Duration(n) * time.Millisecond
 	}
 
-	if err, n = mod.IntParam("hid.sniff.period"); err != nil {
+	if n, err = mod.IntParam("hid.sniff.period"); err != nil {
 		return err
 	} else {
 		mod.sniffPeriod = time.Duration(n) * time.Millisecond
diff --git a/modules/http_proxy/http_proxy.go b/modules/http_proxy/http_proxy.go
index cc4ee952..545194ac 100644
--- a/modules/http_proxy/http_proxy.go
+++ b/modules/http_proxy/http_proxy.go
@@ -92,9 +92,9 @@ func (mod *HttpProxy) Configure() error {
 		return session.ErrAlreadyStarted(mod.Name())
 	} else if err, address = mod.StringParam("http.proxy.address"); err != nil {
 		return err
-	} else if err, proxyPort = mod.IntParam("http.proxy.port"); err != nil {
+	} else if proxyPort, err = mod.IntParam("http.proxy.port"); err != nil {
 		return err
-	} else if err, httpPort = mod.IntParam("http.port"); err != nil {
+	} else if httpPort, err = mod.IntParam("http.port"); err != nil {
 		return err
 	} else if err, scriptPath = mod.StringParam("http.proxy.script"); err != nil {
 		return err
diff --git a/modules/http_server/http_server.go b/modules/http_server/http_server.go
index d5ad1845..6c1023eb 100644
--- a/modules/http_server/http_server.go
+++ b/modules/http_server/http_server.go
@@ -92,7 +92,7 @@ func (mod *HttpServer) Configure() error {
 		return err
 	}
 
-	if err, port = mod.IntParam("http.server.port"); err != nil {
+	if port, err = mod.IntParam("http.server.port"); err != nil {
 		return err
 	}
 
diff --git a/modules/https_proxy/https_proxy.go b/modules/https_proxy/https_proxy.go
index ff70473d..0de3fd4c 100644
--- a/modules/https_proxy/https_proxy.go
+++ b/modules/https_proxy/https_proxy.go
@@ -109,9 +109,9 @@ func (mod *HttpsProxy) Configure() error {
 		return session.ErrAlreadyStarted(mod.Name())
 	} else if err, address = mod.StringParam("https.proxy.address"); err != nil {
 		return err
-	} else if err, proxyPort = mod.IntParam("https.proxy.port"); err != nil {
+	} else if proxyPort, err = mod.IntParam("https.proxy.port"); err != nil {
 		return err
-	} else if err, httpPort = mod.IntParam("https.port"); err != nil {
+	} else if httpPort, err = mod.IntParam("https.port"); err != nil {
 		return err
 	} else if stripSSL, err = mod.BoolParam("https.proxy.sslstrip"); err != nil {
 		return err
diff --git a/modules/https_server/https_server.go b/modules/https_server/https_server.go
index 0d9ff80f..502b0618 100644
--- a/modules/https_server/https_server.go
+++ b/modules/https_server/https_server.go
@@ -110,7 +110,7 @@ func (mod *HttpsServer) Configure() error {
 		return err
 	}
 
-	if err, port = mod.IntParam("https.server.port"); err != nil {
+	if port, err = mod.IntParam("https.server.port"); err != nil {
 		return err
 	}
 
diff --git a/modules/mdns_server/mdns_server.go b/modules/mdns_server/mdns_server.go
index eb9e471c..75a34074 100644
--- a/modules/mdns_server/mdns_server.go
+++ b/modules/mdns_server/mdns_server.go
@@ -114,7 +114,7 @@ func (mod *MDNSServer) Configure() (err error) {
 		return err
 	} else if err, ip6 = mod.StringParam("mdns.server.address6"); err != nil {
 		return err
-	} else if err, port = mod.IntParam("mdns.server.port"); err != nil {
+	} else if port, err = mod.IntParam("mdns.server.port"); err != nil {
 		return err
 	} else if err, info = mod.StringParam("mdns.server.info"); err != nil {
 		return err
diff --git a/modules/mysql_server/mysql_server.go b/modules/mysql_server/mysql_server.go
index 3ddb1d97..09880dd2 100644
--- a/modules/mysql_server/mysql_server.go
+++ b/modules/mysql_server/mysql_server.go
@@ -86,7 +86,7 @@ func (mod *MySQLServer) Configure() error {
 		return err
 	} else if err, address = mod.StringParam("mysql.server.address"); err != nil {
 		return err
-	} else if err, port = mod.IntParam("mysql.server.port"); err != nil {
+	} else if port, err = mod.IntParam("mysql.server.port"); err != nil {
 		return err
 	} else if mod.address, err = net.ResolveTCPAddr("tcp", fmt.Sprintf("%s:%d", address, port)); err != nil {
 		return err
diff --git a/modules/net_probe/net_probe.go b/modules/net_probe/net_probe.go
index 60b1ddab..1f0ca336 100644
--- a/modules/net_probe/net_probe.go
+++ b/modules/net_probe/net_probe.go
@@ -81,7 +81,7 @@ func (mod Prober) Author() string {
 
 func (mod *Prober) Configure() error {
 	var err error
-	if err, mod.throttle = mod.IntParam("net.probe.throttle"); err != nil {
+	if mod.throttle, err = mod.IntParam("net.probe.throttle"); err != nil {
 		return err
 	} else if mod.probes.NBNS, err = mod.BoolParam("net.probe.nbns"); err != nil {
 		return err
diff --git a/modules/packet_proxy/packet_proxy_linux_amd64.go b/modules/packet_proxy/packet_proxy_linux_amd64.go
index 0f4f7243..95424221 100644
--- a/modules/packet_proxy/packet_proxy_linux_amd64.go
+++ b/modules/packet_proxy/packet_proxy_linux_amd64.go
@@ -132,7 +132,7 @@ func (mod *PacketProxy) Configure() (err error) {
 
 	mod.destroyQueue()
 
-	if err, mod.queueNum = mod.IntParam("packet.proxy.queue.num"); err != nil {
+	if mod.queueNum, err = mod.IntParam("packet.proxy.queue.num"); err != nil {
 		return
 	} else if err, mod.chainName = mod.StringParam("packet.proxy.chain"); err != nil {
 		return
diff --git a/modules/syn_scan/syn_scan.go b/modules/syn_scan/syn_scan.go
index 0eaa2dde..b159e62e 100644
--- a/modules/syn_scan/syn_scan.go
+++ b/modules/syn_scan/syn_scan.go
@@ -78,7 +78,7 @@ func NewSynScanner(s *session.Session) *SynScanner {
 				return err
 			} else if err = mod.parsePorts(args); err != nil {
 				return err
-			} else if err, period = mod.IntParam("syn.scan.show-progress-every"); err != nil {
+			} else if period, err = mod.IntParam("syn.scan.show-progress-every"); err != nil {
 				return err
 			} else {
 				mod.progressEvery = time.Duration(period) * time.Second
diff --git a/modules/tcp_proxy/tcp_proxy.go b/modules/tcp_proxy/tcp_proxy.go
index bb4bf736..e4bc1069 100644
--- a/modules/tcp_proxy/tcp_proxy.go
+++ b/modules/tcp_proxy/tcp_proxy.go
@@ -102,13 +102,13 @@ func (mod *TcpProxy) Configure() error {
 		return err
 	} else if err, proxyAddress = mod.StringParam("tcp.proxy.address"); err != nil {
 		return err
-	} else if err, proxyPort = mod.IntParam("tcp.proxy.port"); err != nil {
+	} else if proxyPort, err = mod.IntParam("tcp.proxy.port"); err != nil {
 		return err
-	} else if err, port = mod.IntParam("tcp.port"); err != nil {
+	} else if port, err = mod.IntParam("tcp.port"); err != nil {
 		return err
 	} else if err, tunnelAddress = mod.StringParam("tcp.tunnel.address"); err != nil {
 		return err
-	} else if err, tunnelPort = mod.IntParam("tcp.tunnel.port"); err != nil {
+	} else if tunnelPort, err = mod.IntParam("tcp.tunnel.port"); err != nil {
 		return err
 	} else if err, scriptPath = mod.StringParam("tcp.proxy.script"); err != nil {
 		return err
diff --git a/modules/ticker/ticker.go b/modules/ticker/ticker.go
index 3edaafc3..f049cb7b 100644
--- a/modules/ticker/ticker.go
+++ b/modules/ticker/ticker.go
@@ -62,7 +62,7 @@ func (mod *Ticker) Configure() error {
 		return session.ErrAlreadyStarted(mod.Name())
 	} else if err, commands = mod.StringParam("ticker.commands"); err != nil {
 		return err
-	} else if err, period = mod.IntParam("ticker.period"); err != nil {
+	} else if period, err = mod.IntParam("ticker.period"); err != nil {
 		return err
 	}
 
diff --git a/modules/utils/view_selector.go b/modules/utils/view_selector.go
index ec6347fe..33549bdd 100644
--- a/modules/utils/view_selector.go
+++ b/modules/utils/view_selector.go
@@ -100,7 +100,7 @@ func (s *ViewSelector) Update() (err error) {
 		return
 	} else if err = s.parseSorting(); err != nil {
 		return
-	} else if err, s.Limit = s.owner.IntParam(s.limitName); err != nil {
+	} else if s.Limit, err = s.owner.IntParam(s.limitName); err != nil {
 		return
 	}
 	return
diff --git a/modules/wifi/wifi.go b/modules/wifi/wifi.go
index 37111346..4d7bb014 100644
--- a/modules/wifi/wifi.go
+++ b/modules/wifi/wifi.go
@@ -421,19 +421,19 @@ func (mod *WiFiModule) Configure() error {
 	var hopPeriod int
 	var err error
 
-	if err, mod.apTTL = mod.IntParam("wifi.ap.ttl"); err != nil {
+	if mod.apTTL, err = mod.IntParam("wifi.ap.ttl"); err != nil {
 		return err
-	} else if err, mod.staTTL = mod.IntParam("wifi.sta.ttl"); err != nil {
+	} else if mod.staTTL, err = mod.IntParam("wifi.sta.ttl"); err != nil {
 		return err
 	}
 
 	if err, mod.region = mod.StringParam("wifi.region"); err != nil {
 		return err
-	} else if err, mod.txPower = mod.IntParam("wifi.txpower"); err != nil {
+	} else if mod.txPower, err = mod.IntParam("wifi.txpower"); err != nil {
 		return err
 	} else if err, mod.source = mod.StringParam("wifi.source.file"); err != nil {
 		return err
-	} else if err, mod.minRSSI = mod.IntParam("wifi.rssi.min"); err != nil {
+	} else if mod.minRSSI, err = mod.IntParam("wifi.rssi.min"); err != nil {
 		return err
 	}
 
@@ -517,7 +517,7 @@ func (mod *WiFiModule) Configure() error {
 
 	if mod.skipBroken, err = mod.BoolParam("wifi.skip-broken"); err != nil {
 		return err
-	} else if err, hopPeriod = mod.IntParam("wifi.hop.period"); err != nil {
+	} else if hopPeriod, err = mod.IntParam("wifi.hop.period"); err != nil {
 		return err
 	}
 
diff --git a/modules/wifi/wifi_ap.go b/modules/wifi/wifi_ap.go
index c19406c0..f3ca7af3 100644
--- a/modules/wifi/wifi_ap.go
+++ b/modules/wifi/wifi_ap.go
@@ -22,7 +22,7 @@ func (mod *WiFiModule) parseApConfig() (err error) {
 		return
 	} else if mod.apConfig.BSSID, err = net.ParseMAC(network.NormalizeMac(bssid)); err != nil {
 		return
-	} else if err, mod.apConfig.Channel = mod.IntParam("wifi.ap.channel"); err != nil {
+	} else if mod.apConfig.Channel, err = mod.IntParam("wifi.ap.channel"); err != nil {
 		return
 	} else if mod.apConfig.Encryption, err = mod.BoolParam("wifi.ap.encryption"); err != nil {
 		return
diff --git a/session/module.go b/session/module.go
index a57d3b06..5a0f1b53 100644
--- a/session/module.go
+++ b/session/module.go
@@ -189,16 +189,16 @@ func (m SessionModule) IPParam(name string) (error, net.IP) {
 	}
 }
 
-func (m SessionModule) IntParam(name string) (error, int) {
+func (m SessionModule) IntParam(name string) (int, error) {
 	if p, found := m.params[name]; found {
 		if v, err := p.Get(m.Session); err != nil {
-			return err, 0
+			return 0, err
 		} else {
-			return nil, v.(int)
+			return v.(int), nil
 		}
 
 	} else {
-		return fmt.Errorf("Parameter %s does not exist.", name), 0
+		return 0, fmt.Errorf("Parameter %s does not exist.", name)
 	}
 }
 
diff --git a/tls/cert.go b/tls/cert.go
index acb585e8..91e89d67 100644
--- a/tls/cert.go
+++ b/tls/cert.go
@@ -58,7 +58,7 @@ func CertConfigToModule(prefix string, m *session.SessionModule, defaults CertCo
 }
 
 func CertConfigFromModule(prefix string, m session.SessionModule) (cfg CertConfig, err error) {
-	if err, cfg.Bits = m.IntParam(prefix + ".certificate.bits"); err != nil {
+	if cfg.Bits, err = m.IntParam(prefix + ".certificate.bits"); err != nil {
 		return cfg, err
 	} else if err, cfg.Country = m.StringParam(prefix + ".certificate.country"); err != nil {
 		return cfg, err