Fix Null Pointer, implement Logos