ADDED ERROR HANDLING> YO!