Added user prone error handling