HomeDevelopment

fix: catch nullreference