Add some compat for spigot; should stop an NPE