Revert to py3, add error checking