Removed StorageState validation method
Refactored some validation and added SQLException catches
Fixed compilation errors