Fixed handling of boost::promises to avoid process termination in the event of early destruction of promises.
Improved handling of CBFS key as per Prakash's suggestion.