catch error in view
view docstrings
Merge remote-tracking branch 'gcetusic/master'