Minor improvement, but add more error checking
Fill setup.py