ensure there's alsway a meaningful error message
use correct method
upgrade
Merge pull request #46 from mikey179/master

upgrade