Better error handling, changed bundle use to intent