Undoing the last commit.
Added a fallback for when a state request is made by an old client, without a properly formatted ID.