The catheter assembly includes a catheter hub, a hollow tubular catheterconnected thereto and opening into a chamber within the catheter hub, aneedle, and a valve assembly disposed within the chamber. The valveassembly includes a generally tubular first valve portion, and a second valveportion that is a two-way valve openable to permit the fluid flow through thechamber in the catheter hub in both a proximal direction and a distaldirection.The catheter assembly also includes a needle guard assembly comprising ahousing having the needle extending therethrough and connected to thecatheter hub. A needle guard, disposed within the housing, comprises aneedle trap moveable between a ready position and a protected position, inwhich the needle trap blocks the sharpened needle tip of the needle. Aresilient arm biases the needle trap into the protected position.