Catch null values in Time and Weather (#30 & #33)