Added more error handles