Remove timing logging
Add error for rare corner case