Adding Fail-fast