diff --git a/knp_utils/db_handler.py b/knp_utils/db_handler.py
index bc5d9f6..188be0a 100644
--- a/knp_utils/db_handler.py
+++ b/knp_utils/db_handler.py
@@ -210,10 +210,10 @@ def update_record(self, document_obj):
                 i += 1
             else:
                 is_success = True
-                logger.error(msg='We wait {} times to avoid conflict, however it does NOT resolve. We record it as error.'.format(N_RETRY))
                 break
             if i == N_RETRY:
                 self.db_connection.rollback()
+                logger.error(msg='We wait {} times to avoid conflict, however it does NOT resolve. We record it as error.'.format(N_RETRY))
                 return False
 
         return True
@@ -239,10 +239,10 @@ def get_one_record(self, record_id):
             else:
                 is_success = True
                 cur.close()
-                logger.error(msg='We wait {} times to avoid conflict, however it does NOT resolve. We record it as error.'.format(N_RETRY))
                 break
             if i == N_RETRY:
                 self.db_connection.rollback()
+                logger.error(msg='We wait {} times to avoid conflict, however it does NOT resolve. We record it as error.'.format(N_RETRY))
                 return False
 
         return DocumentObject(
diff --git a/setup.py b/setup.py
index e1c98cb..a533d50 100644
--- a/setup.py
+++ b/setup.py
@@ -2,7 +2,7 @@
 
 from setuptools import setup, find_packages
 
-version = '0.16'
+version = '0.17'
 name = 'knp-utils'
 short_description = 'Wrapper scripts for Japanese parser `KNP`'
 author = 'Kensuke Mitsuzawa'