diff --git a/server/datedetector.py b/server/datedetector.py
index dafcdbfb..bc257e36 100644
--- a/server/datedetector.py
+++ b/server/datedetector.py
@@ -41,8 +41,8 @@ class DateDetector:
 		self.__templates = list()
 	
 	def addDefaultTemplate(self):
+		self.__lock.acquire()
 		try:
-			self.__lock.acquire()
 			# standard
 			template = DateStrptime()
 			template.setName("Month Day Hour:Minute:Second")
@@ -100,8 +100,8 @@ class DateDetector:
 		return self.__templates
 	
 	def matchTime(self, line):
+		self.__lock.acquire()
 		try:
-			self.__lock.acquire()
 			for template in self.__templates:
 				match = template.matchDate(line)
 				if not match == None:
@@ -111,8 +111,8 @@ class DateDetector:
 			self.__lock.release()
 
 	def getTime(self, line):
+		self.__lock.acquire()
 		try:
-			self.__lock.acquire()
 			for template in self.__templates:
 				try:
 					date = template.getDate(line)
@@ -137,8 +137,8 @@ class DateDetector:
 	# in this object and thus should be called from time to time.
 	
 	def sortTemplate(self):
+		self.__lock.acquire()
 		try:
-			self.__lock.acquire()
 			logSys.debug("Sorting the template list")
 			self.__templates.sort(lambda x, y: cmp(x.getHits(), y.getHits()))
 			self.__templates.reverse()
diff --git a/server/datetemplate.py b/server/datetemplate.py
index de11b6a8..443ad1ba 100644
--- a/server/datetemplate.py
+++ b/server/datetemplate.py
@@ -35,7 +35,6 @@ class DateTemplate:
 		self.__name = ""
 		self.__regex = ""
 		self.__cRegex = None
-		self.__pattern = ""
 		self.__hits = 0
 	
 	def setName(self, name):
@@ -51,15 +50,6 @@ class DateTemplate:
 	def getRegex(self):
 		return self.__regex
 	
-	def setPattern(self, pattern):
-		self.__pattern = pattern.strip()
-		
-	def getPattern(self):
-		return self.__pattern
-	
-	def isValid(self):
-		return self.__regex != "" and self.__pattern != ""
-	
 	def getHits(self):
 		return self.__hits
 	
@@ -112,6 +102,13 @@ class DateStrptime(DateTemplate):
 	
 	def __init__(self):
 		DateTemplate.__init__(self)
+		self.__pattern = ""
+	
+	def setPattern(self, pattern):
+		self.__pattern = pattern.strip()
+		
+	def getPattern(self):
+		return self.__pattern
 	
 	#@staticmethod
 	def convertLocale(date):