diff --git a/src/lib/ecl/validation/data_validator.cpp b/src/lib/ecl/validation/data_validator.cpp
index 299811ea43..4e55849df0 100644
--- a/src/lib/ecl/validation/data_validator.cpp
+++ b/src/lib/ecl/validation/data_validator.cpp
@@ -118,34 +118,34 @@ DataValidator::confidence(uint64_t timestamp)
 	if (_time_last == 0) {
 		_error_mask |= ERROR_FLAG_NO_DATA;
 		ret = 0.0f;
-	}
-	
+
 	/* timed out - that's it */
-	if (timestamp - _time_last > _timeout_interval) {
+	} else if (timestamp - _time_last > _timeout_interval) {
 		_error_mask |= ERROR_FLAG_TIMEOUT;
 		ret = 0.0f;
-	}
 
 	/* we got the exact same sensor value N times in a row */
-	if (_value_equal_count > VALUE_EQUAL_COUNT_MAX) {
+	} else if (_value_equal_count > VALUE_EQUAL_COUNT_MAX) {
 		_error_mask |= ERROR_FLAG_STALE_DATA;
 		ret = 0.0f;
-	}
-	
+
 	/* check error count limit */
-	if (_error_count > NORETURN_ERRCOUNT) {
+	} else if (_error_count > NORETURN_ERRCOUNT) {
 		_error_mask |= ERROR_FLAG_HIGH_ERRCOUNT;
 		ret = 0.0f;
-	}
 
 	/* cap error density counter at window size */
-	if (_error_density > ERROR_DENSITY_WINDOW) {
+	} else if (_error_density > ERROR_DENSITY_WINDOW) {
 		_error_mask |= ERROR_FLAG_HIGH_ERRDENSITY;
 		_error_density = ERROR_DENSITY_WINDOW;
+
+	/* no error */
+	} else {
+		_error_mask = ERROR_FLAG_NO_ERROR;
 	}
 	
 	/* no critical errors */
-	if(ret > 0.0f) {
+	if (ret > 0.0f) {
 		/* return local error density for last N measurements */
 		ret = 1.0f - (_error_density / ERROR_DENSITY_WINDOW);
 	}
diff --git a/src/lib/ecl/validation/data_validator.h b/src/lib/ecl/validation/data_validator.h
index 31f6d9d989..c313b1cb04 100644
--- a/src/lib/ecl/validation/data_validator.h
+++ b/src/lib/ecl/validation/data_validator.h
@@ -97,7 +97,7 @@ public:
 	 * Get the error state of this validator
 	 * @return		the bitmask with the error status
 	 */
-	uint32_t		state() { return (_error_mask); }
+	uint32_t		state() { return _error_mask; }
 	
 	/**
 	 * Reset the error state of this validator