Changed to abort instead of redirect