do hash check before checking if both values are empty

do hash check before checking if both values are empty #596