Improved error handling + some polishing