Merge "Fix null-pointer-dereferences accessing the SampleTable"