Fix base-app segmentation fault
Merge pull request #753 from sjinks/base-app-crash

Fix base-app segmentation fault