Added a load more logging for better diagnosis of faults.