diff --git a/ebclibrary/src/main/java/org/mpisws/encounters/dbplatform/ContentProviderBase.java b/ebclibrary/src/main/java/org/mpisws/encounters/dbplatform/ContentProviderBase.java
index ea1e43f18bb644a16cad49e88193df03f0f49897..51e2b3566b16b6e04262a7b26d388b22b0ef2721 100644
--- a/ebclibrary/src/main/java/org/mpisws/encounters/dbplatform/ContentProviderBase.java
+++ b/ebclibrary/src/main/java/org/mpisws/encounters/dbplatform/ContentProviderBase.java
@@ -87,14 +87,18 @@ public abstract class ContentProviderBase extends ContentProvider {
         final SQLiteDatabase db = dbHelper.getWritableDatabase(GlobalObjectRegistry.getObject(ESCredentials.class).getUserHandle());
         final MatchType matchType = codeToModel(matcher.match(uri));
         final DBModel dmb = matchType.getModel();
-        final long rowID = db.insertOrThrow(dmb.getTableName(), null, values);
-        if (rowID == -1) {
-            throw new SQLException("Insert failed");
+        try {
+            final long rowID = db.insertOrThrow(dmb.getTableName(), null, values);
+            if (rowID == -1) {
+                throw new SQLException("Insert failed");
+            }
+            final Uri insertedRowURI = ContentUris.withAppendedId(EncounterHistoryAPM.getContentURI(dmb), rowID);
+            getContext().getContentResolver().notifyChange(insertedRowURI, null);
+            return insertedRowURI;
+        } catch (Exception e) {
+            Log.e(TAG, e.getMessage());
         }
-        final Uri insertedRowURI = ContentUris.withAppendedId(EncounterHistoryAPM.getContentURI(dmb), rowID);
-        getContext().getContentResolver().notifyChange(insertedRowURI, null);
-        //Log.d(TAG, "Insert done");
-        return insertedRowURI;
+        return null;
     }
 
     public String addPKIDConditionToWhereClause(final String where, final String pkidString) { // TODO add to whereArgs instead
diff --git a/ebclibrary/src/main/java/org/mpisws/encounters/encounterhistory/bridges/EncounterEntriesBridge.java b/ebclibrary/src/main/java/org/mpisws/encounters/encounterhistory/bridges/EncounterEntriesBridge.java
index aa70dd255e28c1cac2fda8bdeb5167391ab16783..a14bce4911a8e5e88a34fd0aaf20e71a78a3f072 100644
--- a/ebclibrary/src/main/java/org/mpisws/encounters/encounterhistory/bridges/EncounterEntriesBridge.java
+++ b/ebclibrary/src/main/java/org/mpisws/encounters/encounterhistory/bridges/EncounterEntriesBridge.java
@@ -99,7 +99,7 @@ public class EncounterEntriesBridge extends AbstractEncountersBridge<MEncounterE
         values.put(PEncounterEntries.Columns.userHandle, userHandle);
         try {
             context.getContentResolver().insert(EncounterHistoryAPM.getContentURI(EncounterHistoryAPM.encounterEntries), values);
-        } catch (SQLiteConstraintException e) {
+        } catch (Exception e) {
             Log.d(TAG, "Duplicate insert attempted");
         }
     }