diff --git a/prog/sensord/sense.c b/prog/sensord/sense.c
index 4fa29b83..6ab3adb6 100644
--- a/prog/sensord/sense.c
+++ b/prog/sensord/sense.c
@@ -45,11 +45,20 @@ static const char *chipName(const sensors_chip_name *chip)
 
 static int idChip(const sensors_chip_name *chip)
 {
-	const char *adapter;
+	const char *name, *adapter;
+
+	name = chipName(chip);
+	if (!name) {
+		sensorLog(LOG_ERR, "Error getting chip name");
+		return -1;
+	}
+
+	sensorLog(LOG_INFO, "Chip: %s", name);
 
-	sensorLog(LOG_INFO, "Chip: %s", chipName(chip));
 	adapter = sensors_get_adapter_name(&chip->bus);
-	if (adapter)
+	if (!adapter)
+		sensorLog(LOG_INFO, "Error getting adapter name");
+	else
 		sensorLog(LOG_INFO, "Adapter: %s", adapter);
 
 	return 0;
@@ -151,8 +160,11 @@ static int doKnownChip(const sensors_chip_name *chip,
 	const FeatureDescriptor *features = descriptor->features;
 	int i, ret = 0;
 
-	if (action == DO_READ)
+	if (action == DO_READ) {
 		ret = idChip(chip);
+		if (ret)
+			return ret;
+	}
 
 	for (i = 0; features[i].format; i++) {
 		ret = do_features(chip, features + i, action);