Merge "Fixed null pointer exception" into main