Manual enforce is not needed. Also fail faster.
Merge pull request #14 from yschaeff/various_fixes

Manual enforce is not needed. Also fail faster.