HH-37909 better error handle and debug