nicer variable name
Slightly improved error handling