Stopping load on error

Change-Id: Ia7291cdefb15227e14fbda6f2d440b868f124549