Errors were being raised because of returning None in Python 2 (due to a missing else branch) and because of re-encoding bytes in Python 2.

I changed the code to use str2bytes in the cases where bytes are expected.