Simplify BCD decoding
Cleanup exceptions