Fixed 500 on not found.
Merge branch 'test' into dev