If init folder not found use the default folder

And small code improvements