Better error handling added