HOTFIX: Use '?.' operator to avoid NullpointerException