Add more checking to decode 50 method