Fixed issue, which causes a null pointer exception when interacting with the frontend