Fixed not having client selected. #147