Revert "Throw an exception when discriminator is not found"

This reverts commit 3557fe31c92ea8d76c90052f9b8b6da963300c4f.