Build: fixed nil at exlusion of code
Issue 89,90 was harder to fix than I thought. but know it should to the trick