[FIX] World time only client side - See #454
[OPTIMIZATION] Removed duplicated code checking for nulls