Merge "Handle unsupported schema case better"