Merge "Fix NPE in RNA#callOnFinished"