Additional logging and error parsing