Merge "Catch exception if there is no package name in the session" into main