adjusted exception raises - closes #2