Final setup.py cleanup for now, and exception handling.