Simpler exception handling