diff --git a/src/Kp2aBusinessLogic/database/Database.cs b/src/Kp2aBusinessLogic/database/Database.cs
index 930d9422..99ea6ad9 100644
--- a/src/Kp2aBusinessLogic/database/Database.cs
+++ b/src/Kp2aBusinessLogic/database/Database.cs
@@ -76,6 +76,7 @@ namespace keepass2android
 			}
 			set
 			{
+				Kp2aLog.Log("Locked=" + _locked);
 				_locked = value;
 			}
 		}
diff --git a/src/Kp2aBusinessLogic/database/edit/LoadDB.cs b/src/Kp2aBusinessLogic/database/edit/LoadDB.cs
index dd912065..378a4614 100644
--- a/src/Kp2aBusinessLogic/database/edit/LoadDB.cs
+++ b/src/Kp2aBusinessLogic/database/edit/LoadDB.cs
@@ -47,11 +47,11 @@ namespace keepass2android
 				SaveFileData (_ioc, _key);
 				
 			} catch (KeyFileException) {
-				Android.Util.Log.Debug("KP2ATest", "KeyFileException");
+				Kp2aLog.Log("KeyFileException");
 				Finish(false, /*TODO Localize: use Keepass error text KPRes.KeyFileError (including "or invalid format")*/ _app.GetResourceString(UiStringKey.keyfile_does_not_exist));
 			}
 			catch (Exception e) {
-				Android.Util.Log.Debug("KP2ATest", "Exception: "+e.Message);
+				Kp2aLog.Log("Exception: " + e.Message);
 				Finish(false, "An error occured: " + e.Message);
 				return;
 			} 
@@ -87,7 +87,7 @@ namespace keepass2android
 				return;
 			}
 			*/
-			Android.Util.Log.Debug("KP2ATest", "LoadDB OK");
+			Kp2aLog.Log("LoadDB OK");
 			Finish(true);
 		}
 		
diff --git a/src/Kp2aBusinessLogic/database/edit/OnFinish.cs b/src/Kp2aBusinessLogic/database/edit/OnFinish.cs
index 9ddf4b5f..8fd26f4f 100644
--- a/src/Kp2aBusinessLogic/database/edit/OnFinish.cs
+++ b/src/Kp2aBusinessLogic/database/edit/OnFinish.cs
@@ -76,6 +76,7 @@ namespace keepass2android
 		public static void DisplayMessage(Context ctx, string message)
 		{
 			if ( !String.IsNullOrEmpty(message) ) {
+				Kp2aLog.Log("OnFinish message: "+message);
 				Toast.MakeText(ctx, message, ToastLength.Long).Show();
 			}
 		}