[#66]Remove duplication of code for taking/picking images
Improve handling of DB inconsistency when updating an Update.