Clean up error handling
Add explicit version argument
Remove defunct comment