Connection: change argument check