added some handling for errors that Paul encountered
Merge branch 'master' of https://github.com/aleaf/SFR