better errors and using .format
missed a couple.
Merge pull request #116 from brack3t/feature/better-errors

Feature/better errors