Hotfixed null pointer exception