[TASK] Comments
[BUGFIX] Nullpointer