Added error propagation