Merge "Fix infinite recursion due to error log message"