Added support for org\'s repo
Optimized error log