Added some debugging code.
Trim before checking for @