Code factorization

Merged the 2 checks made when no Jakefile was specified