As far as I can tell, you're handling it correctly, but it might be nice to add a non-ASCII-safe UTF8 password like "déjà vu" for regression test purposes.