Attempt at fixing an NPE, take two.
Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7