Issue #17 - Only throw a single exception