diff --git a/code/client/managedsoftwareupdate b/code/client/managedsoftwareupdate
index ea33baa3..5fb76a04 100755
--- a/code/client/managedsoftwareupdate
+++ b/code/client/managedsoftwareupdate
@@ -739,7 +739,8 @@ def main():
     updatecheckresult = None
     if not skip_munki_check:
         try:
-            updatecheckresult = updatecheck.check(client_id=options.id)
+            updatecheckresult = updatecheck.check(
+                client_id=options.id.decode('UTF-8'))
         except:
             munkicommon.display_error('Unexpected error in updatecheck:')
             munkicommon.log(traceback.format_exc())
diff --git a/code/client/munkilib/updatecheck.py b/code/client/munkilib/updatecheck.py
index b3231c85..fcecac8c 100755
--- a/code/client/munkilib/updatecheck.py
+++ b/code/client/munkilib/updatecheck.py
@@ -2587,7 +2587,7 @@ def getmanifest(partialurl, suppress_errors=False):
             partialurl.startswith('https://') or
             partialurl.startswith('file:/')):
         # then it's really a request for the client's primary manifest
-        manifestdisplayname = os.path.basename(partialurl)
+        manifestdisplayname = os.path.basename(partialurl.encode('UTF-8'))
         manifesturl = partialurl
         partialurl = 'client_manifest'
         manifestname = 'client_manifest.plist'
@@ -2595,7 +2595,8 @@ def getmanifest(partialurl, suppress_errors=False):
         # request for nested manifest
         manifestdisplayname = partialurl
         manifestname = partialurl
-        manifesturl = manifestbaseurl + urllib2.quote(partialurl)
+        manifesturl = (
+            manifestbaseurl + urllib2.quote(partialurl.encode('UTF-8')))
 
     if manifestname in MANIFESTS:
         return MANIFESTS[manifestname]