Handle case when --run-only is not used

Closes #108