Add additional debugging to try and identify cause of MB#11103