* Living End - Fixed possible NPE.