improving error log and add CommandTimeout prop