Fix handling of unsupported schemas