changing load func to be more error prone
Merge branch 'master' of github.com:jesstruck/psp