Fix exception in tank type fallback logic

Fix exception in tank type fallback logic #57