removed old files and added exception catching on common errors