Handling exception due to bug 1372858