Fix routes (better error handling)
Merge pull request #42 from caiiiycuk/incoming

Fix routes (better error handling)