added better error messaging
Merge commit '6d696fd0a7c5294a152abea849e79be265656e1f'