--- a/pkg/imports/wp.go	Thu Jan 31 12:40:54 2019 +0100
+++ b/pkg/imports/wp.go	Thu Jan 31 16:32:18 2019 +0100
@@ -127,8 +127,39 @@
 	conn *sql.Conn,
 	feedback Feedback,
 ) (interface{}, error) {
+	start := time.Now()
 
-	start := time.Now()
+	tx, err := conn.BeginTx(ctx, nil)
+	if err != nil {
+		return nil, err
+	}
+	defer tx.Rollback()
+
+	//  TODO: Download profile geometries from WFS.
+
+	summary, err := wp.processCSV(ctx, importID, tx, start, feedback)
+	if err != nil {
+		return nil, fmt.Errorf("error processing CVS: %v", err)
+	}
+
+	if err := tx.Commit(); err != nil {
+		return nil, fmt.Errorf(
+			"Importing waterway profiles failed after %s: %v",
+			time.Since(start), err)
+	}
+
+	feedback.Info("Importing waterway profiles took %s",
+		time.Since(start))
+	return summary, nil
+}
+
+func (wp *WaterwayProfiles) processCSV(
+	ctx context.Context,
+	importID int64,
+	tx *sql.Tx,
+	start time.Time,
+	feedback Feedback,
+) (interface{}, error) {
 
 	f, err := os.Open(filepath.Join(wp.Dir, "wp.csv"))
 	if err != nil {
@@ -158,12 +189,10 @@
 		sourceIdx    = -1
 	)
 
-	type headerField struct {
+	fields := []struct {
 		idx    *int
 		substr string
-	}
-
-	fields := []headerField{
+	}{
 		{&locationIdx, "location"},
 		{&validFromIdx, "valid_from"},
 		{&validToIdx, "valid_to"},
@@ -206,12 +235,6 @@
 
 	parseDate := misc.TimeGuesser([]string{"02.01.2006"}).Guess
 
-	tx, err := conn.BeginTx(ctx, nil)
-	if err != nil {
-		return nil, err
-	}
-	defer tx.Rollback()
-
 	insertStmt, err := tx.PrepareContext(ctx, insertWaterwayProfileSQL)
 	if err != nil {
 		return nil, err
@@ -348,15 +371,7 @@
 		return nil, UnchangedError("No new entries in waterway profiles.")
 	}
 
-	if err := tx.Commit(); err != nil {
-		return nil, fmt.Errorf(
-			"Importing waterway profiles failed after %s: %v",
-			time.Since(start), err)
-	}
-
 	feedback.Info("%d new entries in waterway profiles.", len(ids))
-	feedback.Info("Importing waterway profiles took %s",
-		time.Since(start))
 
 	summary := struct {
 		IDs []int64 `json:"ids"`