diff -p -up beagle-0.3.9/beagled/SqliteUtils.cs.mono2.6 beagle-0.3.9/beagled/SqliteUtils.cs
--- beagle-0.3.9/beagled/SqliteUtils.cs.mono2.6	2008-01-02 00:25:15.000000000 +0100
+++ beagle-0.3.9/beagled/SqliteUtils.cs	2009-12-16 14:27:28.000000000 +0100
@@ -55,7 +55,8 @@ namespace Beagle.Util {
 					try {
 						ret = command.ExecuteNonQuery ();
 						break;
-					} catch (SqliteBusyException ex) {
+					} catch (SqliteException ex) {
+					if (ex.ErrorCode == SQLiteErrorCode.Busy)
 						Thread.Sleep (50);
 					} catch (Exception e) {
 						Log.Error (e, "SQL that caused the exception: {0}", command_text);
@@ -79,7 +80,8 @@ namespace Beagle.Util {
 				try {
 					ret = command.ExecuteNonQuery ();
 					break;
-				} catch (SqliteBusyException ex) {
+				} catch (SqliteException ex) {
+				if (ex.ErrorCode == SQLiteErrorCode.Busy)
 					Thread.Sleep (50);
 				} catch (Exception e) {
 					Log.Error ( e, "SQL that caused the exception: {0}", command.CommandText);
@@ -96,7 +98,8 @@ namespace Beagle.Util {
 			while (reader == null) {
 				try {
 					reader = command.ExecuteReader ();
-				} catch (SqliteBusyException ex) {
+				} catch (SqliteException ex) {
+				if (ex.ErrorCode == SQLiteErrorCode.Busy)
 					Thread.Sleep (50);
 				}
 			}
@@ -108,7 +111,8 @@ namespace Beagle.Util {
 			while (true) {
 				try {
 					return reader.Read ();
-				} catch (SqliteBusyException ex) {
+				} catch (SqliteException ex) {
+				if (ex.ErrorCode == SQLiteErrorCode.Busy)
 					Thread.Sleep (50);
 				}
 			}
diff -p -up beagle-0.3.9/Util/FSpotTools.cs.mono2.6 beagle-0.3.9/Util/FSpotTools.cs
--- beagle-0.3.9/Util/FSpotTools.cs.mono2.6	2007-11-27 02:49:59.000000000 +0100
+++ beagle-0.3.9/Util/FSpotTools.cs	2009-12-16 14:27:58.000000000 +0100
@@ -85,7 +85,8 @@ namespace Beagle.Util {
 							while (reader == null) {
 								try {
 									reader = command.ExecuteReader ();
-								} catch (SqliteBusyException) {
+								} catch (SqliteException ex) {
+								if (ex.ErrorCode == SQLiteErrorCode.Busy)
 									Thread.Sleep (50);
 								}
 							}