Fix previous commit (unhandled exception + full list displayed)