diff -Nru vineyard-1.5.1~98~ubuntu17.04.1/debian/changelog vineyard-1.5.1~99~ubuntu17.04.1/debian/changelog
--- vineyard-1.5.1~98~ubuntu17.04.1/debian/changelog	2017-05-28 18:01:24.000000000 +0000
+++ vineyard-1.5.1~99~ubuntu17.04.1/debian/changelog	2017-08-25 12:56:52.000000000 +0000
@@ -1,8 +1,8 @@
-vineyard (1.5.1~98~ubuntu17.04.1) zesty; urgency=low
+vineyard (1.5.1~99~ubuntu17.04.1) zesty; urgency=low
 
   * Auto build.
 
- -- Christian Dannie Storgaard <cybolic@gmail.com>  Sun, 28 May 2017 18:01:24 +0000
+ -- Christian Dannie Storgaard <cybolic@gmail.com>  Fri, 25 Aug 2017 12:56:52 +0000
 
 vineyard (0.1.6) precise quantal raring saucy trusty utopic vivid wily xenial; urgency=medium
 
diff -Nru vineyard-1.5.1~98~ubuntu17.04.1/debian/git-build-recipe.manifest vineyard-1.5.1~99~ubuntu17.04.1/debian/git-build-recipe.manifest
--- vineyard-1.5.1~98~ubuntu17.04.1/debian/git-build-recipe.manifest	2017-05-28 18:01:24.000000000 +0000
+++ vineyard-1.5.1~99~ubuntu17.04.1/debian/git-build-recipe.manifest	2017-08-25 12:56:52.000000000 +0000
@@ -1,2 +1,2 @@
-# git-build-recipe format 0.4 deb-version 1.5.1~98
-lp:~cybolic/vineyard git-commit:7a957bdf2d6b85d1f164ed6872976b898d5059f6
+# git-build-recipe format 0.4 deb-version 1.5.1~99
+lp:~cybolic/vineyard git-commit:c38a46b78b4a05dea94f520345195304a130a37a
diff -Nru vineyard-1.5.1~98~ubuntu17.04.1/wine/registry.py vineyard-1.5.1~99~ubuntu17.04.1/wine/registry.py
--- vineyard-1.5.1~98~ubuntu17.04.1/wine/registry.py	2017-05-28 18:01:24.000000000 +0000
+++ vineyard-1.5.1~99~ubuntu17.04.1/wine/registry.py	2017-08-25 12:56:52.000000000 +0000
@@ -28,7 +28,7 @@
                 util.string_escape_char(branch.lower(), '\\')
             )[1].split('"acp"="')[1].split('"')[0]
         return 'cp{0}'.format(codepage)
-    except (IOError, IndexError):
+    except (IOError, TypeError, IndexError):
         # Windows default
         return 'cp1252'