Fixed issue with server errors