#2457 small tweak to avoid exceptions on new content