Prevent possible creation of Empty Gas Canister in a couple of places. Fixes #1031.