A method of detecting race conditions in a service based communication architecture network (600) comprising a Message Broker, MB, function (210) mediating messages, relating to service procedures, between one or more services available to a User Equipment, UE, (11) communicating within the service based communication architecture network (600). The method comprising receiving, by the MB (210), from the services, a message relating to at least one of start and end of a service procedure. Determining, by the MB (210), based on the received message, that the service procedure causes a race condition, and intervening, upon detection of a race condition, in executing the service procedures. There is also provided a Message Broker, MB, function (210) arranged for detecting and handling race conditions, a communication network (600) comprising an integrated message broker and race condition handler (210) and a computer program product.