Moved assets into the correct folder. Fixed a possible NPE.