diff --git a/build.gradle b/build.gradle
index 0cfcb57..18a5620 100644
--- a/build.gradle
+++ b/build.gradle
@@ -42,7 +42,7 @@ dependencies {
     testCompile "org.xbib:bibliographic-character-sets:${project.property('bibliographic-character-sets.version')}"
     testCompile "org.xbib:content-core:${project.property('content-core.version')}"
     asciidoclet "org.asciidoctor:asciidoclet:${project.property('asciidoclet.version')}"
-    wagon "org.apache.maven.wagon:wagon-ssh-external:${project.property('wagon-ssh-external.version')}"
+    wagon "org.apache.maven.wagon:wagon-ssh:${project.property('wagon-ssh.version')}"
 }
 
 sourceCompatibility = JavaVersion.VERSION_1_8
diff --git a/gradle.properties b/gradle.properties
index 3cd29d4..b5b4b1a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,6 +1,6 @@
 group = org.xbib
 name = marc
-version = 1.0.11
+version = 1.0.12
 
 junit.version = 4.12
 xalan.version = 2.7.2
@@ -9,4 +9,4 @@ system-rules.version = 1.16.0
 bibliographic-character-sets.version = 1.0.0
 content-core.version = 1.0.7
 asciidoclet.version = 1.5.4
-wagon-ssh-external.version = 2.10
+wagon-ssh.version = 2.12
diff --git a/gradle/publish.gradle b/gradle/publish.gradle
index 59f73fd..5b7e49d 100644
--- a/gradle/publish.gradle
+++ b/gradle/publish.gradle
@@ -6,7 +6,7 @@ task xbibUpload(type: Upload) {
         if (project.hasProperty('xbibUsername')) {
             mavenDeployer {
                 configuration = configurations.wagon
-                repository(url: uri('scpexe://xbib.org/repository')) {
+                repository(url: uri('sftp://xbib.org/repository')) {
                         authentication(userName: xbibUsername, privateKey: xbibPrivateKey)
                 }
             }
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 5a5ffd6..eb8cfb7 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index bbd13aa..6ca0426 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Thu Feb 23 17:00:52 CET 2017
+#Tue May 09 22:21:42 CEST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-all.zip
diff --git a/src/main/java/org/xbib/marc/dialects/pica/PicaXMLContentHandler.java b/src/main/java/org/xbib/marc/dialects/pica/PicaXMLContentHandler.java
index c38959d..27f6a1f 100644
--- a/src/main/java/org/xbib/marc/dialects/pica/PicaXMLContentHandler.java
+++ b/src/main/java/org/xbib/marc/dialects/pica/PicaXMLContentHandler.java
@@ -89,7 +89,6 @@ public class PicaXMLContentHandler extends MarcContentHandler implements PicaCon
                         tag = value.substring(0, 3);
                         indicator = value.substring(3);
                     }
-
                 }
                 MarcField.Builder builder = MarcField.builder().tag(tag).indicator(indicator);
                 stack.push(builder);
@@ -105,18 +104,23 @@ public class PicaXMLContentHandler extends MarcContentHandler implements PicaCon
                         tag = value.substring(0, 3);
                         indicator = value.substring(3);
                     }
-
                 }
                 MarcField.Builder builder = MarcField.builder().tag(tag).indicator(indicator);
                 stack.push(builder);
                 break;
             }
             case SUBFIELD: {
-                stack.peek().subfield(atts.getValue(CODE_ATTRIBUTE), null);
+                String subfieldId = atts.getValue(CODE_ATTRIBUTE);
+                if (!subfieldId.isEmpty()) {
+                    stack.peek().subfield(subfieldId, null);
+                }
                 break;
             }
             case SUBF_TAG: {
-                stack.peek().subfield(atts.getValue(ID_ATTRIBUTE), null);
+                String subfieldId = atts.getValue(ID_ATTRIBUTE);
+                if (!subfieldId.isEmpty()) {
+                    stack.peek().subfield(subfieldId, null);
+                }
                 break;
             }
             case GLOBAL_TAG:
@@ -146,7 +150,11 @@ public class PicaXMLContentHandler extends MarcContentHandler implements PicaCon
                 break;
             }
             case TAG_ATTRIBUTE: {
-                MarcField marcField = stack.pop().value(content.toString()).build();
+                MarcField.Builder marcFieldBuilder = stack.pop();
+                if (content.length() > 0) {
+                    marcFieldBuilder.value(content.toString());
+                }
+                MarcField marcField = marcFieldBuilder.build();
                 if (marcValueTransformers != null) {
                     marcField = marcValueTransformers.transformValue(marcField);
                 }
@@ -155,7 +163,9 @@ public class PicaXMLContentHandler extends MarcContentHandler implements PicaCon
             }
             case SUBFIELD:
             case SUBF_TAG: {
-                stack.peek().subfieldValue(content.toString());
+                if (content.length() > 0) {
+                    stack.peek().subfieldValue(content.toString());
+                }
                 break;
             }
             case GLOBAL_TAG: