Fix a NPE that never occurs and release again