Accomodate for first save... Take II

This is where the exception actually occured.