updated for unusual exception