Added minor safety check
Fixed disappearing separator line issue
Merge pull request #161 from MIT-Mobile/3.6/dev-intrepid-svoigt

3.6/dev intrepid svoigt