added ifdef for hubomz
changed error message
merging with latest hubo-walk