Merge "Addresses LP#917976 * Adds basic logging when exceptions occur"