Oops, introduced a NPE when using SourceControl overlays