Handle Client Issues

Handle Client Issues