Now properly copes with the pipeline tables being absent