Removed non-mixing stuff to retry on server - it appears error catching isn't working
Made slight changes to error handling; ready for testing