Small updates to error handling in server