diff --git a/configure.ac b/configure.ac
index 01a9e60d7a902345ac5f4d663e2d48d7391b6389..e6d6c85b2dc80f55cefe491c87c134fc8b1d5e1d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -191,6 +191,8 @@ if test "$enable_coverage" = "yes"; then
       CXXFLAGS="$CXXFLAGS -fno-inline -fno-inline-small-functions -fno-default-inline"
       # unused function is an issue without inlining
       CXXFLAGS="$CXXFLAGS -Wno-unused-function"
+      # Add to linker
+      LDFLAGS="$LDFLAGS -lgov --coverage"
    else
       AC_MSG_ERROR(Cannot use coverage without gcc)
    fi
diff --git a/coverage.sh b/coverage.sh
index 8f66d7b53ae48b13af97181258e509f7e59247ad..188938896e4bdb05ea6b5e78e1cab3fe836aea9e 100755
--- a/coverage.sh
+++ b/coverage.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+set -e
+
 args=$@
 if [ "$#" -eq 0 ]; then
     echo "Running the full script"