Fix some stuff.

As suggested in Buildcraft issue 1800.

Don't pass null arguements.
Condense stuff into a single statement.