Added empty storage and updated exception handler in complete