Bug Fix: Fix crashes if location values are not captured