Added additional tracing to detect common errors
Improved error handling
Updated version