Yep, will change to fail-fast style