Couple fixes for better error handling with paramaters
Merge pull request #28 from natechadwick/development

Couple fixes for better error handling with paramaters