Removed some fail-fast logic.