Bug fixes for exception cases and merged cells

Here are the changes for your review.

Thanks!
Bob