promise check for -> + unit test
Merge pull request #516 from basvandervlies/quick_fix

promise check for -> + unit test