Add timeout, counter and better error logging