COde coverage with istanbul
Improved error handling