Added error messages for bad addresses
Merge branch 'ux' into development