You were allowed to have one handluggage item + one of the following:
briefcase
camera
handbag
laptop(case)
So you should be allowed to bring both items onboard.
BTW was the MAN-AMS operated by KLC? There is limited space on KLC A/C so they sometimes ask you to check you bags on those flights.