More robustness. Wow.
Better message printing