diff --git a/scripts/codecoverage.sh b/scripts/codecoverage.sh
index ccc2f0c..482b331 100755
--- a/scripts/codecoverage.sh
+++ b/scripts/codecoverage.sh
@@ -16,15 +16,15 @@ COVERAGE_DIR=$SOURCE_DIR"/build/testcc-info"
 HTML_RESULTS_DIR=$SOURCE_DIR"/build/testcc-html"
 COVERAGE_FILTER="*Qt*.framework* *Xcode.app* *.moc *moc_*.cpp */test/* *qrc_* ui_* *qt.headers */build/* *main*.* *c++*"
 
-
-
 main() {
-  testcc "$@"
-}
+    NAME=$( basename $PWD )
+    if [ "$NAME" != "server-sdk" ]; then 
+      COVERAGE_FILTER+=" *server-sdk*"
+    fi
 
-function testcc() {
     if [ ! -d src ]; then
-      fail "src dir does not exists"
+      fail "'src' dir does not exists. ${BLUE}Expecting 'src' dir with c++ source code${NC}"
+      
     else 
       pass "src dir exits"
     fi
@@ -91,7 +91,7 @@ function testcc() {
     ${LCOV} -d ${BUILDPATH} -c -o ${COVERAGE_DIR}/coverage.info
 
     info "Filtering code coverage info report"
-    ${LCOV} -r ${COVERAGE_DIR}/coverage.info $COVERAGE_FILTER $ENV_COVERAGE_FILTER -o ${COVERAGE_DIR}/coverage-filtered.info
+    ${LCOV} -r ${COVERAGE_DIR}/coverage.info $COVERAGE_FILTER -o ${COVERAGE_DIR}/coverage-filtered.info
 
     info "Creating html output"
     mkdir -p ${HTML_RESULTS_DIR}
@@ -124,6 +124,7 @@ function pass() {
 
 function fail() {
   FAIL="true"; echo -e "[${RED}FAIL${NC}] $@"
+  exit
 }
 
 # Run main function
diff --git a/scripts/cppcheck.sh b/scripts/cppcheck.sh
index 9846b85..d0290a0 100755
--- a/scripts/cppcheck.sh
+++ b/scripts/cppcheck.sh
@@ -50,7 +50,9 @@ function pass() {
 
 function fail() {
   FAIL="true"; echo -e "[${RED}FAIL${NC}] $@"
+  exit
 }
 
+
 # Run main function
 main "$@"
diff --git a/scripts/doc.sh b/scripts/doc.sh
index ce34688..62fe130 100755
--- a/scripts/doc.sh
+++ b/scripts/doc.sh
@@ -62,6 +62,7 @@ function pass() {
 
 function fail() {
   FAIL="true"; echo -e "[${RED}FAIL${NC}] $@"
+  exit
 }