Fixed update when no callback is given
Better error handling
better error handling