Improved error handling
Removed hard-wired deps