Only throw exceptions in one place
Merge pull request #558 from dantleech/improve_qb_validation_2

Only throw exceptions in one place