Updated the description and tried to fix a null pointer exception