fix invalid exception names

Signed-off-by: Jan Dvořák <mordae@anilinux.org>
fix options alignment issue

We have been accidentally aligning header after the body.

Signed-off-by: Jan Dvořák <mordae@anilinux.org>