Added defensive coding as we don't have the new variation db handed over yet!