Use 'domain' variables only for actual Domain objects
Remove unnecessary session check