Adding abort on error