Add more logging and restart stream