Fix a couple of high priority findbugs issues.

You're right ... this condition would never be met anyway. Good pick up!

@scoen