Making the build stable so it does not crash on start up