Merge operation
Fix exception handling oversight