ignore connect for empty storage
Merge branch 'issue-7' into develop