Refactor timing variables check for None values

Refactor timing variables check for None values #27