Merge fix for error bubbling. Refer #36