DO_NOT_MERGE: review only

modify to: exit with an error