Prevent NPE on resumption of media session

Resolves NPE introduced in !943 (merged). Moved logic after null-check and added curly braces to increase readability.

See comment in !943 (merged) for more details.

Fixes #1434 (closed)