Updated to handle "null" value sent in by JavaScript tracker