diff --git a/CHANGELOG.md b/CHANGELOG.md
index 38923c682e3ed536096a4697446c9f6ba7a54fb4..d84e1ea681c60c7035ec690954882f01997610bf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
 # Version 0.4.0 (2020-02-26)
 
 - Minimize contract wasm binary size:
+  - Run `wasm-opt` on the contract Wasm binary.
   - Uses [`cargo-xbuild`](https://github.com/rust-osdev/cargo-xbuild) to build custom sysroot crates without panic string
 bloat.
   - Automatically removes the `rlib` crate type from `Cargo.toml`, removing redundant metadata.
diff --git a/src/cmd/build.rs b/src/cmd/build.rs
index 20671fff8825702193c616972010c6546397058c..0537b19af4b7fccdf1ee09e9728bf8b298801d28 100644
--- a/src/cmd/build.rs
+++ b/src/cmd/build.rs
@@ -130,7 +130,9 @@ fn build_cargo_project(crate_metadata: &CrateMetadata, verbosity: Option<Verbosi
         let exit_status = xargo_lib::build(args, "build", Some(config))
             .map_err(|e| anyhow::anyhow!("{}", e))
             .context("Building with xbuild")?;
-        log::debug!("xargo exit status: {:?}", exit_status);
+        if !exit_status.success() {
+            anyhow::bail!("xbuild failed with status {}", exit_status)
+        }
         Ok(())
     };