Let FileCatalog object resolve the catalogs to be used
Protect against a failed "df" call
Merge pull request #1198 from atsareg/fix

Several fixes