Add better logging - try to find the bug