Fix handler_strings race condition a different way