Merge "Remove no longer needed getErrorString(...)"