diff --git a/lib/onewire_master.c b/lib/onewire_master.c
index a0b962b..736fb79 100644
--- a/lib/onewire_master.c
+++ b/lib/onewire_master.c
@@ -343,6 +343,7 @@ bool onewire_master_rom_search(uint64_t* code, bool alarm)
 				*code &= ~(((uint64_t)1)<<bit); // remember valid bit 0
 				break;
 			default: // two 1's indicate there is no slave
+				conflict_current = 64; // remember there was no conflict because there is no slave
 				goto end; // an error has occurred
 		}
 		buffer_size = 1; // to send next bit
diff --git a/lib/onewire_master.h b/lib/onewire_master.h
index 3f740a3..8ee26c4 100644
--- a/lib/onewire_master.h
+++ b/lib/onewire_master.h
@@ -57,6 +57,7 @@ uint64_t onewire_master_rom_read(void);
  *  @param[in,out] code use 0 to start search ROM code from scratch, or last know value to search next; writes back next ROM code found, or 0 if error occurred
  *  @param[in] alarm search only for ROM codes for slaves with an alarm flag set
  *  @return if an additional slave has been detected
+ *  @warning when the code found is 0 it very probably means that the 1-wire line is not pulled up instead of actually having found a slave with ROM code 0
  */
 bool onewire_master_rom_search(uint64_t* code, bool alarm);
 /** send SKIP ROM command (all slaves on the bus will be selected)