handle various starting states for workflow
Merge pull request #1420 from shackbarth/ndfix

handle various starting states for workflow