Additional logging/error handling features