Structure change
Error Handling corrected