One time CRC check with caching.
Removed a return after an error throwing (cleaning).