Various lint cleanup
Catch ValueError in decoding