Added error checking
Merge branch 'signals'

Conflicts:
	src/rshell.cpp