Catch-All fix
Merge pull request #745 from sonatype/catch-all-fix

Catch-All fix