diff --git a/kwant/wraparound.py b/kwant/wraparound.py
index 25217826e4c653325072c7d325f6eae90a92d2fb..08efec8c668567acb374b12bfbed7777f0571bb5 100644
--- a/kwant/wraparound.py
+++ b/kwant/wraparound.py
@@ -362,10 +362,14 @@ def plot_2d_bands(syst, k_x=31, k_y=31, params=None,
     if not hasattr(syst, '_wrapped_symmetry'):
         raise TypeError("Expecting a system that was produced by "
                         "'kwant.wraparound.wraparound'.")
-    if not isinstance(syst, system.FiniteSystem):
+    if isinstance(syst, system.InfiniteSystem):
         msg = ("All symmetry directions must be wrapped around: specify "
                "'keep=None' when calling 'kwant.wraparound.wraparound'.")
         raise TypeError(msg)
+    if isinstance(syst, builder.Builder):
+        msg = ("Expecting a finalized system: remember to finalize your "
+               "system with 'syst.finalized()'.")
+        raise TypeError(msg)
 
     params = params or {}
     lat_ndim, space_ndim = syst._wrapped_symmetry.periods.shape