Fixing to break on first error