Better exception messages
Small cleanup.
Fix 100% CPU bug