fixed try-catch
cleaned routes
Merge pull request #3 from liuggio/master

minor fixies