Fix for exceptions due to unknown available columns

Change-Id: If8b62cf06e76dd1d190fa8f1f9ee9ba476364cf2