Use new session methodology.
Use new session methodology
Fix app_by_short_name to check for None obj.