Eclipse 4.x fix: Don't attempt to get display too early

Also fix a couple of potential NPEs.

Change-Id: I80d6b625d672ad2e7b96f2fce311aa4347a45a33
3 files changed