Added more checking into Load