Merge "Replace the console output on Error with fault a message"