Exception handling fix and package for Azure