Mlhr 1625

Added a check for gatewayAddress to be not empty in order to fix MLHR-1625.