model null check in time module
merge builds