Adding support for aliases for non-contacts and cleaned up the exceptions