Fixed Null pointer expection on collection update