Cosmetic changes and exit on policy error