Fix a leak
Fix NPE