PHX-385 fix two crashing bugs and bump version to 2.0.3