Add check in commit to prevent failure if no rw path

Fixes #899