Add nil-handling
Revert "Add nil-handling"

This reverts commit 05094da53c7d62c02b58c7faeba795071ec9c87c.
Update to release reactor