another exception fix