Added user.home property check