Fixed error reporting for initial link
Added repository field