Updated to not throw exceptions. Seriously.
Merge pull request #1 from waynehartman/master

Updated to not throw exceptions.