Reverted part of my 'Fix a NPE' commit