Add return's in save() function