Merge "Add catching of IllegalArgumentException, which gets thrown when there is a malformed Unicode escape character sequence" into main