2 files changed, 18 insertions, 8 deletions
diff --git a/src/wasm-as.cpp b/src/wasm-as.cpp
index 6995859a7..40839ea55 100644
--- a/src/wasm-as.cpp
+++ b/src/wasm-as.cpp
@@ -43,13 +43,18 @@ int main(int argc, const char *argv[]) {
 
   auto input(read_file<std::string>(options.extra["infile"], Flags::Text, options.debug ? Flags::Debug : Flags::Release));
 
-  if (options.debug) std::cerr << "s-parsing..." << std::endl;
-  SExpressionParser parser(const_cast<char*>(input.c_str()));
-  Element& root = *parser.root;
-
-  if (options.debug) std::cerr << "w-parsing..." << std::endl;
   Module wasm;
-  SExpressionWasmBuilder builder(wasm, *root[0]);
+
+  try{
+    if (options.debug) std::cerr << "s-parsing..." << std::endl;
+    SExpressionParser parser(const_cast<char*>(input.c_str()));
+    Element& root = *parser.root;
+    if (options.debug) std::cerr << "w-parsing..." << std::endl;
+    SExpressionWasmBuilder builder(wasm, *root[0]);
+  } catch (ParseException& p) {
+    p.dump(std::cerr);
+    Fatal() << "error in parsing wasm binary";
+  }
 
   if (options.debug) std::cerr << "binarification..." << std::endl;
   BufferWithRandomAccess buffer(options.debug);
diff --git a/src/wasm-dis.cpp b/src/wasm-dis.cpp
index e2e103b46..93c286913 100644
--- a/src/wasm-dis.cpp
+++ b/src/wasm-dis.cpp
@@ -45,8 +45,13 @@ int main(int argc, const char *argv[]) {
 
   if (options.debug) std::cerr << "parsing binary..." << std::endl;
   Module wasm;
-  WasmBinaryBuilder parser(wasm, input, options.debug);
-  parser.read();
+  try {
+    WasmBinaryBuilder parser(wasm, input, options.debug);
+    parser.read();
+  } catch (ParseException& p) {
+    p.dump(std::cerr);
+    Fatal() << "error in parsing wasm binary";
+  }
 
   if (options.debug) std::cerr << "Printing..." << std::endl;
   Output output(options.extra["output"], Flags::Text, options.debug ? Flags::Debug : Flags::Release);