Changed were exit 1 is placed