Add a catch in case the block is not stored
Fix style issues