Server tweak
Error handling

- Added error handling