6hour crash NPE fix