diff --git a/enteletaor_lib/modules/redis/redis_disconnect.py b/enteletaor_lib/modules/redis/redis_disconnect.py
index aa9ad08..7a4796e 100644
--- a/enteletaor_lib/modules/redis/redis_disconnect.py
+++ b/enteletaor_lib/modules/redis/redis_disconnect.py
@@ -22,9 +22,13 @@ def action_redis_server_disconnect(config):
 	# Disconnect all clients?
 	if config.disconnect_all:
 		for c in clients:
-			con.client_kill(c)
+			try:
+				con.client_kill(c)
+
+				log.error("  - Client '%s' was disconnected" % c)
+			except redis.exceptions.ResponseError:
+				log.error("  - Client '%s' is not connected" % c)
 
-			log.error("  - Client '%s' was disconnected" % c)
 
 	# Disconnect only one user
 	else:
@@ -35,9 +39,12 @@ def action_redis_server_disconnect(config):
 
 		try:
 			_c = clients[config.client]
+			try:
+				con.client_kill(_c)
 
-			con.client_kill(_c)
+				log.error("  - Client '%s' was disconnected" % _c)
+			except redis.exceptions.ResponseError:
+				log.error("  - Client '%s' is not connected" % _c)
 
-			log.error("  - Client '%s' was disconnected" % _c)
 		except KeyError:
 			log.error("  <!> Client '%s' doesn't appear to be connected to server" % config.client)
diff --git a/enteletaor_lib/modules/tasks/tasks_list_process.py b/enteletaor_lib/modules/tasks/tasks_list_process.py
index 6fbcc2e..d88652e 100644
--- a/enteletaor_lib/modules/tasks/tasks_list_process.py
+++ b/enteletaor_lib/modules/tasks/tasks_list_process.py
@@ -65,7 +65,10 @@ def action_proc_list_tasks(config):
 			# Save template
 			# --------------------------------------------------------------------------
 			# Build path in current dir
-			export_path = "%s.json" % os.path.abspath(config.template)
+			export_path = os.path.abspath(config.template)
+
+			if ".json" not in export_path:
+				export_path += ".json"
 
 			# dumps
 			json.dump(export_data, open(export_path, "w"))