Fixes for crashing app if progress block is nil

Minor fixes - added conditions for check blocks