improve logs
add cheking of uuid with discovery