git-svn: minor cleanups, extra error-checking