Fixed Cargo state handling
Error handling in directory storage