Removed a redundant check of a known non-null value
Don't catch an Exception not thrown within the try block
Merge remote-tracking branch 'origin/master' into new_media_fix

Conflicts:
	src/main/java/net/pms/dlna/MediaMonitor.java