Fixes error codes against Insight
Merge pull request #1634 from eordano/fix/waitCreate

Fixes error codes against Insight