Minor Improvements

Catches rare exceptions