Fixed NPE I thought I fixed previously....