What I do is just make sure that he is nice and tucked in as he kicks his blankets everywhere when he isn't happy, pat him on his chest/stomach and talk to him calmly. Just tell him I love him and I'll be here when he wakes up, silly stuff like that. When he stops crying and has calmed down himself, then I walk away. It doesn't always work, but it has often enough for me to keep doing it.

Thankfully he settles at night so I haven't had to worry about night time yet, probably would try the same thing.