can we move this safe-guards into a separate PR?