Ensuring we call next when saga not found, fixes #2215

Added more explicit registration filtering for saga behavior to ensure it is called in the correct order.