minor changes
fix error handling on server
fix router parameter matching