Adding missing assert to return_handler