preventing nil from dropping through - HOTFIX