Refactor and fix a bug with FQDN parsing

[f3rn0s]

Hey, my goal here was to fix a specific error and to refactor a bit of code, namely in some cases where the FQDN is malformed (i.e. they set it to CLIENTNAME instead of CLIENTNAME.local etc.) then the code will fail. This fixes that issue.