diff --git a/core/comms/xorms.go b/core/comms/xorms.go
index a9ba890..36d06e3 100644
--- a/core/comms/xorms.go
+++ b/core/comms/xorms.go
@@ -24,11 +24,15 @@ func XormOneDb(db *gocloud.DBHelper, id, data interface{}, columns ...interface{
 	var tb interface{}
 	var tbcol interface{}
 	if okkey {
-		if len(columns) > 2 && columns[1] != nil && columns[2] != nil {
-			tb = columns[1]
-			tbcol = columns[2]
-		} else if len(columns) > 1 && columns[1] != nil {
-			tbcol = columns[1]
+		if len(columns) > 2 {
+			if columns[1] != nil && columns[2] != nil {
+				tb = columns[1]
+				tbcol = columns[2]
+			}
+		} else if len(columns) > 1 {
+			if columns[1] != nil {
+				tbcol = columns[1]
+			}
 		}
 	} else {
 		if len(columns) > 1 && columns[1] != nil {