He should be fine. Be sure you talk to him and he recognizes you are there prior to picking him up. Don't come at him straight on as that can illicit a defensive strike if he's already wound up. If he's in an s formation, keep talking to him calmly and quietly until he settles down a bit or leave and come back in 20 minutes. Don't let him buffalo you though. If he see's that being a meany keeps you away it could happen more often.