Added null check and v minor refactoring
Only adding fragment on Activity Create if it doesn't already exist.