Complain that no DF basis was specified only if we haven't specified a non-DF method.
Merge commit '9be8302cc4f1b91e6cccd04e61e710cb41defe67'