Fix two minor buglets

One throws an error while throwing an error (inception error) while the
other creates a warning on recent R versions due to matching a name
partially in a data.frame