diff --git a/Makefile b/Makefile
index 1db70918..cac6d9fc 100644
--- a/Makefile
+++ b/Makefile
@@ -72,14 +72,14 @@ checkdb:
 	fi; done
 
 formatdb:
-	@make checkdb
 	@for DB in database/*; do if [ -d $$DB ]; then \
 		echo ; \
 		echo "Formatting $$DB"; \
 		echo "============================"; \
-		($(IN_ENV) cd $$DB; python3 ../../utils/sort_db.py); \
+		($(IN_ENV) cd $$DB; python3 ../../utils/sort_db.py || exit 1) || exit 1; \
 	fi; done
-	$(IN_ENV) ./utils/info_md.py
+	@make checkdb
+	$(IN_ENV) ./utils/info_md.py --keep
 
 clean:
 	$(MAKE) -C database clean