Fixes

Fixing variable and removing {0} case since it would not throw an
exception regarding unsupported type.