Resolve swap and arrange intermittent 500 error