Merge "catch detailed error log"