Add more logging and verify hostname