adding guard clauses to headers and header stub

adding guard clauses to headers and header stub