Code cleanup, and handle failure to add a song to the DB

Change-Id: I43d7f588e17762fdfae5f83b22c766f921b4e000