Make sure init and sample commands don't fail in rare cases
Merge pull request #284 from Icenium/tashkov/fix-init

Make sure init and sample commands don't fail in rare cases