Great Merge Disaster fixes; restored exception handling.