Added error handling for FS server errors