Fix for Issue 7 when period_start and period_end values nil