Initial Commit
Prevent error message null