guard against missing organisation code
give better error message
add missing bit of DB model