Handle repo not found better