Flashdev coverity fixes

[aaron.nyholm at unfoldedeffective.com]

This patch addresses both coverity issues. I moved the data sanitation
from in the functions to before they are called.

Thanks, Aaron.