Fix, but revert return value

You're right about the error, @benctamas. I like your fix, but I'm thinking the interface to client code should be simple (return simply *None*, no intermediary tuple).
If you accept my modification, I'll pull your patch and bring it up to date with the more recent pull requests.
BTW, sorry for the delay :( Haven't had much time to devote to this package as of late.