added option to abort on redirect