Minor changes to improve error detection/handling on initialize ...