Better error handling & support for the recent version of Stem