added ifdef for hubomz
changed error message
merged in master