Backward compatibility removal

No longer really required, I figure.
Unnecessary 'if'

The exception already ensures this line will not be reached if != null.
Unnecessary 'if'

Like my previous commit.