Improvements for null prevention and synchronisation.

Signed-off-by: Henry J. Wylde <accounts+git@hjwylde.com>