Improved error handling and made parallel fail-fast