* refactor: Strict null checks for extract-related functions

* Fix

Co-authored-by: Michael Kriese <michael.kriese@visualon.de>