diff --git a/vtm/src/org/oscim/tiling/source/mapfile/MapDatabase.java b/vtm/src/org/oscim/tiling/source/mapfile/MapDatabase.java
index c2b54028..4594e04c 100644
--- a/vtm/src/org/oscim/tiling/source/mapfile/MapDatabase.java
+++ b/vtm/src/org/oscim/tiling/source/mapfile/MapDatabase.java
@@ -308,13 +308,11 @@ public class MapDatabase implements ITileDataSource {
                 processBlocks(sink, queryParameters, subFileParameter, tile.getBoundingBox(), Selector.ALL, new MapReadResult());
             else
                 processBlocks(sink, queryParameters, subFileParameter);
+            sink.completed(QueryResult.SUCCESS);
         } catch (Throwable t) {
             log.error(t.getMessage(), t);
             sink.completed(QueryResult.FAILED);
-            return;
         }
-
-        sink.completed(QueryResult.SUCCESS);
     }
 
     @Override
diff --git a/vtm/src/org/oscim/tiling/source/mapfile/MultiMapDatabase.java b/vtm/src/org/oscim/tiling/source/mapfile/MultiMapDatabase.java
index 2f7569c5..74451a64 100644
--- a/vtm/src/org/oscim/tiling/source/mapfile/MultiMapDatabase.java
+++ b/vtm/src/org/oscim/tiling/source/mapfile/MultiMapDatabase.java
@@ -74,12 +74,11 @@ public class MultiMapDatabase implements ITileDataSource {
                     mapDatabase.query(tile, dataSink);
                 }
             }
+            sink.completed(QueryResult.SUCCESS);
         } catch (Throwable t) {
             log.error(t.getMessage(), t);
             sink.completed(QueryResult.FAILED);
-            return;
         }
-        sink.completed(QueryResult.SUCCESS);
     }
 
     @Override