Added fail-fast error handling