Fix issues with handling null data/client not ready messages