Remove unused code
Return error from DecodeForm (don't panic)
Handle form decoding error & refactor