Fixing no exists error
Merge branch 'feature-noexist' into develop