- [m] Tiny fix, adding more checks.

Signed-off-by: Daniel S. Reichenbach <daniel@kogitoapp.com>